diff --git a/.gitignore b/.gitignore index 62a80353..7bfa43e0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ /simpleworklist.iml /.classpath /.project -/.idea +#/.idea /.settings /SimpleWorklist.mdzip.bak /mvn.log @@ -19,7 +19,7 @@ /etc/mavenlog3.txt target/ .env -.idea/ +#.idea/ *.iml .classpath .project @@ -33,5 +33,7 @@ setenv.cmd /src/main/java/org/woehlke/simpleworklist/project/x.txt /src/main/java/org/woehlke/simpleworklist/task/x.txt /src/main/java/org/woehlke/simpleworklist/context/x.txt -/src/main/java/org/woehlke/simpleworklist/error/x.txt +/src/main/java/org/woehlke/simpleworklist/application/error/x.txt /src/main/java/org/woehlke/simpleworklist/searchRequest/x.txt +/.idea/workspace.xml +/.idea/misc.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..da7c220a --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 00000000..63e90019 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 00000000..712ab9d9 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file 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 00000000..b8d93d8e --- /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__avalon_framework_avalon_framework_4_1_3.xml b/.idea/libraries/Maven__avalon_framework_avalon_framework_4_1_3.xml new file mode 100644 index 00000000..682831e2 --- /dev/null +++ b/.idea/libraries/Maven__avalon_framework_avalon_framework_4_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__backport_util_concurrent_backport_util_concurrent_3_1.xml b/.idea/libraries/Maven__backport_util_concurrent_backport_util_concurrent_3_1.xml new file mode 100644 index 00000000..c5ed7930 --- /dev/null +++ b/.idea/libraries/Maven__backport_util_concurrent_backport_util_concurrent_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_ethz_ganymed_ganymed_ssh2_build210.xml b/.idea/libraries/Maven__ch_ethz_ganymed_ganymed_ssh2_build210.xml new file mode 100644 index 00000000..1c86a465 --- /dev/null +++ b/.idea/libraries/Maven__ch_ethz_ganymed_ganymed_ssh2_build210.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml new file mode 100644 index 00000000..6fec8f43 --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml new file mode 100644 index 00000000..9eb8596a --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__classworlds_classworlds_1_1.xml b/.idea/libraries/Maven__classworlds_classworlds_1_1.xml new file mode 100644 index 00000000..e4273c0b --- /dev/null +++ b/.idea/libraries/Maven__classworlds_classworlds_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_beust_jcommander_1_72.xml b/.idea/libraries/Maven__com_beust_jcommander_1_72.xml new file mode 100644 index 00000000..ad12dd9b --- /dev/null +++ b/.idea/libraries/Maven__com_beust_jcommander_1_72.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_dkanejs_maven_plugins_docker_compose_maven_plugin_maven_plugin_4_0_0.xml b/.idea/libraries/Maven__com_dkanejs_maven_plugins_docker_compose_maven_plugin_maven_plugin_4_0_0.xml new file mode 100644 index 00000000..78abe57f --- /dev/null +++ b/.idea/libraries/Maven__com_dkanejs_maven_plugins_docker_compose_maven_plugin_maven_plugin_4_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml new file mode 100644 index 00000000..bc7d7fd8 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_10_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_10_3.xml new file mode 100644 index 00000000..aa94641a --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_10_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_10_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_10_3.xml new file mode 100644 index 00000000..e94ceb75 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_10_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_10_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_10_3.xml new file mode 100644 index 00000000..656ffa49 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_10_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_10_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_10_3.xml new file mode 100644 index 00000000..7261701c --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_10_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_10_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_10_3.xml new file mode 100644 index 00000000..5124c4ce --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_10_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_10_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_10_3.xml new file mode 100644 index 00000000..31b440cc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_10_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_mxab_thymeleaf_extras_thymeleaf_extras_data_attribute_2_0_1.xml b/.idea/libraries/Maven__com_github_mxab_thymeleaf_extras_thymeleaf_extras_data_attribute_2_0_1.xml new file mode 100644 index 00000000..8cb87b65 --- /dev/null +++ b/.idea/libraries/Maven__com_github_mxab_thymeleaf_extras_thymeleaf_extras_data_attribute_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_spotbugs_spotbugs_4_0_0.xml b/.idea/libraries/Maven__com_github_spotbugs_spotbugs_4_0_0.xml new file mode 100644 index 00000000..9e7f0f76 --- /dev/null +++ b/.idea/libraries/Maven__com_github_spotbugs_spotbugs_4_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_spotbugs_spotbugs_annotations_4_0_0.xml b/.idea/libraries/Maven__com_github_spotbugs_spotbugs_annotations_4_0_0.xml new file mode 100644 index 00000000..52c76e54 --- /dev/null +++ b/.idea/libraries/Maven__com_github_spotbugs_spotbugs_annotations_4_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_spotbugs_spotbugs_maven_plugin_maven_plugin_4_0_0.xml b/.idea/libraries/Maven__com_github_spotbugs_spotbugs_maven_plugin_maven_plugin_4_0_0.xml new file mode 100644 index 00000000..49c15455 --- /dev/null +++ b/.idea/libraries/Maven__com_github_spotbugs_spotbugs_maven_plugin_maven_plugin_4_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_2.xml b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_2.xml new file mode 100644 index 00000000..1c380d0b --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_8_6.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_8_6.xml new file mode 100644 index 00000000..82a9f20a --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_8_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_errorprone_error_prone_annotations_2_3_4.xml b/.idea/libraries/Maven__com_google_errorprone_error_prone_annotations_2_3_4.xml new file mode 100644 index 00000000..848cecd7 --- /dev/null +++ b/.idea/libraries/Maven__com_google_errorprone_error_prone_annotations_2_3_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml b/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml new file mode 100644 index 00000000..36e948e2 --- /dev/null +++ b/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_guava_guava_28_2_jre.xml b/.idea/libraries/Maven__com_google_guava_guava_28_2_jre.xml new file mode 100644 index 00000000..4c148535 --- /dev/null +++ b/.idea/libraries/Maven__com_google_guava_guava_28_2_jre.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava.xml b/.idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava.xml new file mode 100644 index 00000000..4e15702e --- /dev/null +++ b/.idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_3.xml b/.idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_3.xml new file mode 100644 index 00000000..bacaa456 --- /dev/null +++ b/.idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml new file mode 100644 index 00000000..f19f6eb3 --- /dev/null +++ b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_puppycrawl_tools_checkstyle_8_29.xml b/.idea/libraries/Maven__com_puppycrawl_tools_checkstyle_8_29.xml new file mode 100644 index 00000000..6767f50e --- /dev/null +++ b/.idea/libraries/Maven__com_puppycrawl_tools_checkstyle_8_29.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml b/.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml new file mode 100644 index 00000000..fea99f02 --- /dev/null +++ b/.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_8.xml b/.idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_8.xml new file mode 100644 index 00000000..bea8d79f --- /dev/null +++ b/.idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_mail_jakarta_mail_1_6_5.xml b/.idea/libraries/Maven__com_sun_mail_jakarta_mail_1_6_5.xml new file mode 100644 index 00000000..a86e1762 --- /dev/null +++ b/.idea/libraries/Maven__com_sun_mail_jakarta_mail_1_6_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_1_13.xml b/.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_1_13.xml new file mode 100644 index 00000000..929cba8b --- /dev/null +++ b/.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_1_13.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_xml_fastinfoset_FastInfoset_1_2_16.xml b/.idea/libraries/Maven__com_sun_xml_fastinfoset_FastInfoset_1_2_16.xml new file mode 100644 index 00000000..aa1516a0 --- /dev/null +++ b/.idea/libraries/Maven__com_sun_xml_fastinfoset_FastInfoset_1_2_16.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_qdox_qdox_2_0_M8.xml b/.idea/libraries/Maven__com_thoughtworks_qdox_qdox_2_0_M8.xml new file mode 100644 index 00000000..78061e10 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_qdox_qdox_2_0_M8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml new file mode 100644 index 00000000..b8581a6f --- /dev/null +++ b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_0_42_14.xml new file mode 100644 index 00000000..0d4f3b33 --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_all_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_all_0_42_14.xml new file mode 100644 index 00000000..c3977d4c --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_all_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_abbreviation_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_abbreviation_0_42_14.xml new file mode 100644 index 00000000..324e23b2 --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_abbreviation_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_admonition_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_admonition_0_42_14.xml new file mode 100644 index 00000000..3cac41c1 --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_admonition_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_anchorlink_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_anchorlink_0_42_14.xml new file mode 100644 index 00000000..1641b453 --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_anchorlink_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_aside_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_aside_0_42_14.xml new file mode 100644 index 00000000..80702e4d --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_aside_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_attributes_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_attributes_0_42_14.xml new file mode 100644 index 00000000..ff46341c --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_attributes_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_autolink_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_autolink_0_42_14.xml new file mode 100644 index 00000000..8e108150 --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_autolink_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_definition_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_definition_0_42_14.xml new file mode 100644 index 00000000..bcdf8729 --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_definition_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_emoji_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_emoji_0_42_14.xml new file mode 100644 index 00000000..dce47c07 --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_emoji_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_enumerated_reference_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_enumerated_reference_0_42_14.xml new file mode 100644 index 00000000..29079f8d --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_enumerated_reference_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_escaped_character_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_escaped_character_0_42_14.xml new file mode 100644 index 00000000..c7818720 --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_escaped_character_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_footnotes_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_footnotes_0_42_14.xml new file mode 100644 index 00000000..bf5ea634 --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_footnotes_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gfm_issues_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gfm_issues_0_42_14.xml new file mode 100644 index 00000000..03df30ea --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gfm_issues_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gfm_strikethrough_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gfm_strikethrough_0_42_14.xml new file mode 100644 index 00000000..9dd4a65b --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gfm_strikethrough_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gfm_tables_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gfm_tables_0_42_14.xml new file mode 100644 index 00000000..946d09b7 --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gfm_tables_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gfm_tasklist_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gfm_tasklist_0_42_14.xml new file mode 100644 index 00000000..a1c76a05 --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gfm_tasklist_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gfm_users_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gfm_users_0_42_14.xml new file mode 100644 index 00000000..5ed6d198 --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gfm_users_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gitlab_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gitlab_0_42_14.xml new file mode 100644 index 00000000..70c69f69 --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gitlab_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_ins_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_ins_0_42_14.xml new file mode 100644 index 00000000..60ab157d --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_ins_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_jekyll_front_matter_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_jekyll_front_matter_0_42_14.xml new file mode 100644 index 00000000..3ab0fce0 --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_jekyll_front_matter_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_jekyll_tag_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_jekyll_tag_0_42_14.xml new file mode 100644 index 00000000..29d37e5d --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_jekyll_tag_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_macros_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_macros_0_42_14.xml new file mode 100644 index 00000000..2735ddd6 --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_macros_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_media_tags_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_media_tags_0_42_14.xml new file mode 100644 index 00000000..10055e92 --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_media_tags_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_superscript_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_superscript_0_42_14.xml new file mode 100644 index 00000000..fcab5b81 --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_superscript_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_tables_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_tables_0_42_14.xml new file mode 100644 index 00000000..b03fdda8 --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_tables_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_toc_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_toc_0_42_14.xml new file mode 100644 index 00000000..a912accd --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_toc_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_typographic_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_typographic_0_42_14.xml new file mode 100644 index 00000000..03b7e62d --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_typographic_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_wikilink_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_wikilink_0_42_14.xml new file mode 100644 index 00000000..90a9ea27 --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_wikilink_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_xwiki_macros_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_xwiki_macros_0_42_14.xml new file mode 100644 index 00000000..f62f0153 --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_xwiki_macros_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_yaml_front_matter_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_yaml_front_matter_0_42_14.xml new file mode 100644 index 00000000..f13ba6ba --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_yaml_front_matter_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_youtube_embedded_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_youtube_embedded_0_42_14.xml new file mode 100644 index 00000000..971476c9 --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_youtube_embedded_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_formatter_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_formatter_0_42_14.xml new file mode 100644 index 00000000..20326ea8 --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_formatter_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_html_parser_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_html_parser_0_42_14.xml new file mode 100644 index 00000000..d818c373 --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_html_parser_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_jira_converter_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_jira_converter_0_42_14.xml new file mode 100644 index 00000000..861a0cee --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_jira_converter_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_profile_pegdown_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_profile_pegdown_0_42_14.xml new file mode 100644 index 00000000..8a0ba2b2 --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_profile_pegdown_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_util_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_util_0_42_14.xml new file mode 100644 index 00000000..b0224d30 --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_util_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_youtrack_converter_0_42_14.xml b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_youtrack_converter_0_42_14.xml new file mode 100644 index 00000000..5f8a0b85 --- /dev/null +++ b/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_youtrack_converter_0_42_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_2.xml b/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_2.xml new file mode 100644 index 00000000..eeba7092 --- /dev/null +++ b/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml new file mode 100644 index 00000000..84eb1158 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_chain_commons_chain_1_2.xml b/.idea/libraries/Maven__commons_chain_commons_chain_1_2.xml new file mode 100644 index 00000000..6dcfb49f --- /dev/null +++ b/.idea/libraries/Maven__commons_chain_commons_chain_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_13.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_13.xml new file mode 100644 index 00000000..5384f7ab --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_13.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml new file mode 100644 index 00000000..13afda29 --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_digester_commons_digester_2_1.xml b/.idea/libraries/Maven__commons_digester_commons_digester_2_1.xml new file mode 100644 index 00000000..f1160609 --- /dev/null +++ b/.idea/libraries/Maven__commons_digester_commons_digester_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_0_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_0_1.xml new file mode 100644 index 00000000..f040f164 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_5.xml b/.idea/libraries/Maven__commons_io_commons_io_2_5.xml new file mode 100644 index 00000000..67c2ad2c --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml new file mode 100644 index 00000000..2ec83767 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_1.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_1.xml new file mode 100644 index 00000000..ba50ca21 --- /dev/null +++ b/.idea/libraries/Maven__commons_logging_commons_logging_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_validator_commons_validator_1_6.xml b/.idea/libraries/Maven__commons_validator_commons_validator_1_6.xml new file mode 100644 index 00000000..80e2bb56 --- /dev/null +++ b/.idea/libraries/Maven__commons_validator_commons_validator_1_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_1.xml new file mode 100644 index 00000000..4968206b --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__info_picocli_picocli_4_1_4.xml b/.idea/libraries/Maven__info_picocli_picocli_4_1_4.xml new file mode 100644 index 00000000..ec7e783b --- /dev/null +++ b/.idea/libraries/Maven__info_picocli_picocli_4_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_jpenren_thymeleaf_spring_data_dialect_3_4_0.xml b/.idea/libraries/Maven__io_github_jpenren_thymeleaf_spring_data_dialect_3_4_0.xml new file mode 100644 index 00000000..b857df8c --- /dev/null +++ b/.idea/libraries/Maven__io_github_jpenren_thymeleaf_spring_data_dialect_3_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml b/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml new file mode 100644 index 00000000..be90656e --- /dev/null +++ b/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml b/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml new file mode 100644 index 00000000..cba9dd24 --- /dev/null +++ b/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_persistence_jakarta_persistence_api_2_2_3.xml b/.idea/libraries/Maven__jakarta_persistence_jakarta_persistence_api_2_2_3.xml new file mode 100644 index 00000000..c11957d9 --- /dev/null +++ b/.idea/libraries/Maven__jakarta_persistence_jakarta_persistence_api_2_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_transaction_jakarta_transaction_api_1_3_3.xml b/.idea/libraries/Maven__jakarta_transaction_jakarta_transaction_api_1_3_3.xml new file mode 100644 index 00000000..5b31fe50 --- /dev/null +++ b/.idea/libraries/Maven__jakarta_transaction_jakarta_transaction_api_1_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml b/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml new file mode 100644 index 00000000..e66afb95 --- /dev/null +++ b/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml b/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml new file mode 100644 index 00000000..04213f73 --- /dev/null +++ b/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 00000000..180d5875 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml b/.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml new file mode 100644 index 00000000..ff49512a --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4.xml b/.idea/libraries/Maven__javax_mail_mail_1_4.xml new file mode 100644 index 00000000..ead2b381 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml new file mode 100644 index 00000000..d05c196b --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml b/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml new file mode 100644 index 00000000..a0c4d766 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_1.xml b/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_1.xml new file mode 100644 index 00000000..059f88ff --- /dev/null +++ b/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jaxen_jaxen_1_2_0.xml b/.idea/libraries/Maven__jaxen_jaxen_1_2_0.xml new file mode 100644 index 00000000..c6d18ad6 --- /dev/null +++ b/.idea/libraries/Maven__jaxen_jaxen_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jdom_jdom_1_0.xml b/.idea/libraries/Maven__jdom_jdom_1_0.xml new file mode 100644 index 00000000..3349d675 --- /dev/null +++ b/.idea/libraries/Maven__jdom_jdom_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml new file mode 100644 index 00000000..d4110417 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__log4j_log4j_1_2_12.xml b/.idea/libraries/Maven__log4j_log4j_1_2_12.xml new file mode 100644 index 00000000..f398ab4a --- /dev/null +++ b/.idea/libraries/Maven__log4j_log4j_1_2_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__logkit_logkit_1_0_1.xml b/.idea/libraries/Maven__logkit_logkit_1_0_1.xml new file mode 100644 index 00000000..a548880f --- /dev/null +++ b/.idea/libraries/Maven__logkit_logkit_1_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_8.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_8.xml new file mode 100644 index 00000000..73e43180 --- /dev/null +++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_8.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_8.xml new file mode 100644 index 00000000..4d6fd9a2 --- /dev/null +++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_java_dev_javacc_javacc_5_0.xml b/.idea/libraries/Maven__net_java_dev_javacc_javacc_5_0.xml new file mode 100644 index 00000000..a05ba908 --- /dev/null +++ b/.idea/libraries/Maven__net_java_dev_javacc_javacc_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_jcip_jcip_annotations_1_0.xml b/.idea/libraries/Maven__net_jcip_jcip_annotations_1_0.xml new file mode 100644 index 00000000..d29c82f6 --- /dev/null +++ b/.idea/libraries/Maven__net_jcip_jcip_annotations_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml b/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml new file mode 100644 index 00000000..b3d38583 --- /dev/null +++ b/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml b/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml new file mode 100644 index 00000000..10830235 --- /dev/null +++ b/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_saxon_Saxon_HE_9_9_1_6.xml b/.idea/libraries/Maven__net_sf_saxon_Saxon_HE_9_9_1_6.xml new file mode 100644 index 00000000..c8322bf9 --- /dev/null +++ b/.idea/libraries/Maven__net_sf_saxon_Saxon_HE_9_9_1_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sourceforge_pmd_pmd_core_6_21_0.xml b/.idea/libraries/Maven__net_sourceforge_pmd_pmd_core_6_21_0.xml new file mode 100644 index 00000000..a41f97a7 --- /dev/null +++ b/.idea/libraries/Maven__net_sourceforge_pmd_pmd_core_6_21_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sourceforge_pmd_pmd_java_6_21_0.xml b/.idea/libraries/Maven__net_sourceforge_pmd_pmd_java_6_21_0.xml new file mode 100644 index 00000000..c632b833 --- /dev/null +++ b/.idea/libraries/Maven__net_sourceforge_pmd_pmd_java_6_21_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sourceforge_pmd_pmd_javascript_6_21_0.xml b/.idea/libraries/Maven__net_sourceforge_pmd_pmd_javascript_6_21_0.xml new file mode 100644 index 00000000..e16e0dfe --- /dev/null +++ b/.idea/libraries/Maven__net_sourceforge_pmd_pmd_javascript_6_21_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sourceforge_pmd_pmd_jsp_6_21_0.xml b/.idea/libraries/Maven__net_sourceforge_pmd_pmd_jsp_6_21_0.xml new file mode 100644 index 00000000..446aaba7 --- /dev/null +++ b/.idea/libraries/Maven__net_sourceforge_pmd_pmd_jsp_6_21_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sourceforge_saxon_saxon_9_1_0_8.xml b/.idea/libraries/Maven__net_sourceforge_saxon_saxon_9_1_0_8.xml new file mode 100644 index 00000000..4139d5f6 --- /dev/null +++ b/.idea/libraries/Maven__net_sourceforge_saxon_saxon_9_1_0_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sourceforge_saxon_saxon_dom_9_1_0_8.xml b/.idea/libraries/Maven__net_sourceforge_saxon_saxon_dom_9_1_0_8.xml new file mode 100644 index 00000000..33621aea --- /dev/null +++ b/.idea/libraries/Maven__net_sourceforge_saxon_saxon_dom_9_1_0_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ognl_ognl_3_1_12.xml b/.idea/libraries/Maven__ognl_ognl_3_1_12.xml new file mode 100644 index 00000000..da549e9d --- /dev/null +++ b/.idea/libraries/Maven__ognl_ognl_3_1_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_antlr_antlr4_runtime_4_8_1.xml b/.idea/libraries/Maven__org_antlr_antlr4_runtime_4_8_1.xml new file mode 100644 index 00000000..1e79170b --- /dev/null +++ b/.idea/libraries/Maven__org_antlr_antlr4_runtime_4_8_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_ant_ant_1_10_7.xml b/.idea/libraries/Maven__org_apache_ant_ant_1_10_7.xml new file mode 100644 index 00000000..418a1a95 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_ant_ant_1_10_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_10_7.xml b/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_10_7.xml new file mode 100644 index 00000000..d8f37c4e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_10_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_bcel_bcel_6_2.xml b/.idea/libraries/Maven__org_apache_bcel_bcel_6_2.xml new file mode 100644 index 00000000..ce96b73e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_bcel_bcel_6_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_compress_1_20.xml b/.idea/libraries/Maven__org_apache_commons_commons_compress_1_20.xml new file mode 100644 index 00000000..b762f0e4 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_compress_1_20.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_9.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_9.xml new file mode 100644 index 00000000..9050e004 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_cxf_cxf_api_2_6_3.xml b/.idea/libraries/Maven__org_apache_cxf_cxf_api_2_6_3.xml new file mode 100644 index 00000000..55816b45 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_cxf_cxf_api_2_6_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_cxf_cxf_rt_bindings_xml_2_6_3.xml b/.idea/libraries/Maven__org_apache_cxf_cxf_rt_bindings_xml_2_6_3.xml new file mode 100644 index 00000000..619ebf21 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_cxf_cxf_rt_bindings_xml_2_6_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_cxf_cxf_rt_core_2_6_3.xml b/.idea/libraries/Maven__org_apache_cxf_cxf_rt_core_2_6_3.xml new file mode 100644 index 00000000..08640c3a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_cxf_cxf_rt_core_2_6_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_cxf_cxf_rt_frontend_jaxrs_2_6_3.xml b/.idea/libraries/Maven__org_apache_cxf_cxf_rt_frontend_jaxrs_2_6_3.xml new file mode 100644 index 00000000..c2151968 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_cxf_cxf_rt_frontend_jaxrs_2_6_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_cxf_cxf_rt_transports_http_2_6_3.xml b/.idea/libraries/Maven__org_apache_cxf_cxf_rt_transports_http_2_6_3.xml new file mode 100644 index 00000000..c9d99856 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_cxf_cxf_rt_transports_http_2_6_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_geronimo_javamail_geronimo_javamail_1_4_mail_1_7.xml b/.idea/libraries/Maven__org_apache_geronimo_javamail_geronimo_javamail_1_4_mail_1_7.xml new file mode 100644 index 00000000..bd0191fa --- /dev/null +++ b/.idea/libraries/Maven__org_apache_geronimo_javamail_geronimo_javamail_1_4_mail_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_geronimo_javamail_geronimo_javamail_1_4_provider_1_7.xml b/.idea/libraries/Maven__org_apache_geronimo_javamail_geronimo_javamail_1_4_provider_1_7.xml new file mode 100644 index 00000000..a0796f97 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_geronimo_javamail_geronimo_javamail_1_4_provider_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_javamail_1_4_spec_1_7.xml b/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_javamail_1_4_spec_1_7.xml new file mode 100644 index 00000000..10a60d24 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_javamail_1_4_spec_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_12.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_12.xml new file mode 100644 index 00000000..9cb68a28 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_13.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_13.xml new file mode 100644 index 00000000..b475675a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_13.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_12_1.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_12_1.xml new file mode 100644 index 00000000..ad038546 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_12_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_12_1.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_12_1.xml new file mode 100644 index 00000000..b4b1b1b6 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_12_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_core_1_9.xml b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_core_1_9.xml new file mode 100644 index 00000000..b2c020e9 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_core_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_decoration_model_1_9_2.xml b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_decoration_model_1_9_2.xml new file mode 100644 index 00000000..6a802113 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_decoration_model_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_integration_tools_1_9_2.xml b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_integration_tools_1_9_2.xml new file mode 100644 index 00000000..843e5808 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_integration_tools_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_logging_api_1_7.xml b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_logging_api_1_7.xml new file mode 100644 index 00000000..8f4af266 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_logging_api_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_apt_1_9_1.xml b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_apt_1_9_1.xml new file mode 100644 index 00000000..53d7c472 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_apt_1_9_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_confluence_1_9_1.xml b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_confluence_1_9_1.xml new file mode 100644 index 00000000..c2581887 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_confluence_1_9_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_docbook_simple_1_9_1.xml b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_docbook_simple_1_9_1.xml new file mode 100644 index 00000000..75490cbd --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_docbook_simple_1_9_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_fml_1_9_1.xml b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_fml_1_9_1.xml new file mode 100644 index 00000000..93b39c74 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_fml_1_9_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_markdown_1_9_1.xml b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_markdown_1_9_1.xml new file mode 100644 index 00000000..0652ee39 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_markdown_1_9_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_twiki_1_9_1.xml b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_twiki_1_9_1.xml new file mode 100644 index 00000000..5f49c36f --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_twiki_1_9_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_xdoc_1_9_1.xml b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_xdoc_1_9_1.xml new file mode 100644 index 00000000..c6f549f4 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_xdoc_1_9_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_xhtml5_1_9_1.xml b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_xhtml5_1_9_1.xml new file mode 100644 index 00000000..f8647a11 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_xhtml5_1_9_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_xhtml_1_9_1.xml b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_xhtml_1_9_1.xml new file mode 100644 index 00000000..7ca6e275 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_xhtml_1_9_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_sink_api_1_7.xml b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_sink_api_1_7.xml new file mode 100644 index 00000000..2947f85b --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_sink_api_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_site_renderer_1_7_4.xml b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_site_renderer_1_7_4.xml new file mode 100644 index 00000000..7b6ea2f3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_site_renderer_1_7_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_skin_model_1_7_4.xml b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_skin_model_1_7_4.xml new file mode 100644 index 00000000..2ecd7b6e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_doxia_doxia_skin_model_1_7_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_enforcer_enforcer_api_3_0_0_M3.xml b/.idea/libraries/Maven__org_apache_maven_enforcer_enforcer_api_3_0_0_M3.xml new file mode 100644 index 00000000..2fcb38d1 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_enforcer_enforcer_api_3_0_0_M3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_enforcer_enforcer_rules_3_0_0_M3.xml b/.idea/libraries/Maven__org_apache_maven_enforcer_enforcer_rules_3_0_0_M3.xml new file mode 100644 index 00000000..f0de8221 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_enforcer_enforcer_rules_3_0_0_M3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_aether_provider_3_0.xml b/.idea/libraries/Maven__org_apache_maven_maven_aether_provider_3_0.xml new file mode 100644 index 00000000..c5679011 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_maven_aether_provider_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_archiver_3_4_0.xml b/.idea/libraries/Maven__org_apache_maven_maven_archiver_3_4_0.xml new file mode 100644 index 00000000..428c9353 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_maven_archiver_3_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_artifact_3_0.xml b/.idea/libraries/Maven__org_apache_maven_maven_artifact_3_0.xml new file mode 100644 index 00000000..4afa3bad --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_maven_artifact_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_artifact_manager_2_2_1.xml b/.idea/libraries/Maven__org_apache_maven_maven_artifact_manager_2_2_1.xml new file mode 100644 index 00000000..dc250a12 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_maven_artifact_manager_2_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_compat_3_0.xml b/.idea/libraries/Maven__org_apache_maven_maven_compat_3_0.xml new file mode 100644 index 00000000..dbb8b01d --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_maven_compat_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_core_3_0.xml b/.idea/libraries/Maven__org_apache_maven_maven_core_3_0.xml new file mode 100644 index 00000000..6dea8872 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_maven_core_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_jxr_3_0_0.xml b/.idea/libraries/Maven__org_apache_maven_maven_jxr_3_0_0.xml new file mode 100644 index 00000000..34698b64 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_maven_jxr_3_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_model_3_0.xml b/.idea/libraries/Maven__org_apache_maven_maven_model_3_0.xml new file mode 100644 index 00000000..9235b644 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_maven_model_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_model_builder_3_0.xml b/.idea/libraries/Maven__org_apache_maven_maven_model_builder_3_0.xml new file mode 100644 index 00000000..39c8f37c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_maven_model_builder_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_plugin_api_3_0.xml b/.idea/libraries/Maven__org_apache_maven_maven_plugin_api_3_0.xml new file mode 100644 index 00000000..91f8ba24 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_maven_plugin_api_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_plugin_descriptor_2_2_1.xml b/.idea/libraries/Maven__org_apache_maven_maven_plugin_descriptor_2_2_1.xml new file mode 100644 index 00000000..5908a5b2 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_maven_plugin_descriptor_2_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_plugin_registry_2_2_1.xml b/.idea/libraries/Maven__org_apache_maven_maven_plugin_registry_2_2_1.xml new file mode 100644 index 00000000..6b914cef --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_maven_plugin_registry_2_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_profile_2_2_1.xml b/.idea/libraries/Maven__org_apache_maven_maven_profile_2_2_1.xml new file mode 100644 index 00000000..33c5188a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_maven_profile_2_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_project_2_2_1.xml b/.idea/libraries/Maven__org_apache_maven_maven_project_2_2_1.xml new file mode 100644 index 00000000..42ac7836 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_maven_project_2_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_repository_metadata_3_0.xml b/.idea/libraries/Maven__org_apache_maven_maven_repository_metadata_3_0.xml new file mode 100644 index 00000000..c8cc3a0a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_maven_repository_metadata_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_settings_3_0.xml b/.idea/libraries/Maven__org_apache_maven_maven_settings_3_0.xml new file mode 100644 index 00000000..33b87600 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_maven_settings_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_settings_builder_3_0.xml b/.idea/libraries/Maven__org_apache_maven_maven_settings_builder_3_0.xml new file mode 100644 index 00000000..9637cf35 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_maven_settings_builder_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_toolchain_2_2_1.xml b/.idea/libraries/Maven__org_apache_maven_maven_toolchain_2_2_1.xml new file mode 100644 index 00000000..3dfc84db --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_maven_toolchain_2_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_plugin_tools_maven_plugin_annotations_3_5_2.xml b/.idea/libraries/Maven__org_apache_maven_plugin_tools_maven_plugin_annotations_3_5_2.xml new file mode 100644 index 00000000..bfd7645c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_plugin_tools_maven_plugin_annotations_3_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_plugins_maven_changes_plugin_maven_plugin_2_12_1.xml b/.idea/libraries/Maven__org_apache_maven_plugins_maven_changes_plugin_maven_plugin_2_12_1.xml new file mode 100644 index 00000000..ee8c7769 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_plugins_maven_changes_plugin_maven_plugin_2_12_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_plugins_maven_checkstyle_plugin_maven_plugin_3_1_1.xml b/.idea/libraries/Maven__org_apache_maven_plugins_maven_checkstyle_plugin_maven_plugin_3_1_1.xml new file mode 100644 index 00000000..c0caa8dc --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_plugins_maven_checkstyle_plugin_maven_plugin_3_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_plugins_maven_clean_plugin_maven_plugin_3_1_0.xml b/.idea/libraries/Maven__org_apache_maven_plugins_maven_clean_plugin_maven_plugin_3_1_0.xml new file mode 100644 index 00000000..71fad370 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_plugins_maven_clean_plugin_maven_plugin_3_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_plugins_maven_compiler_plugin_maven_plugin_3_8_1.xml b/.idea/libraries/Maven__org_apache_maven_plugins_maven_compiler_plugin_maven_plugin_3_8_1.xml new file mode 100644 index 00000000..3d48759d --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_plugins_maven_compiler_plugin_maven_plugin_3_8_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_plugins_maven_dependency_plugin_maven_plugin_3_1_2.xml b/.idea/libraries/Maven__org_apache_maven_plugins_maven_dependency_plugin_maven_plugin_3_1_2.xml new file mode 100644 index 00000000..fd487c0f --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_plugins_maven_dependency_plugin_maven_plugin_3_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_plugins_maven_enforcer_plugin_maven_plugin_3_0_0_M3.xml b/.idea/libraries/Maven__org_apache_maven_plugins_maven_enforcer_plugin_maven_plugin_3_0_0_M3.xml new file mode 100644 index 00000000..1e9345ab --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_plugins_maven_enforcer_plugin_maven_plugin_3_0_0_M3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_plugins_maven_invoker_plugin_maven_plugin_3_2_1.xml b/.idea/libraries/Maven__org_apache_maven_plugins_maven_invoker_plugin_maven_plugin_3_2_1.xml new file mode 100644 index 00000000..5b01b55d --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_plugins_maven_invoker_plugin_maven_plugin_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_plugins_maven_jxr_plugin_maven_plugin_3_0_0.xml b/.idea/libraries/Maven__org_apache_maven_plugins_maven_jxr_plugin_maven_plugin_3_0_0.xml new file mode 100644 index 00000000..10ef86b4 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_plugins_maven_jxr_plugin_maven_plugin_3_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_plugins_maven_pmd_plugin_maven_plugin_3_13_0.xml b/.idea/libraries/Maven__org_apache_maven_plugins_maven_pmd_plugin_maven_plugin_3_13_0.xml new file mode 100644 index 00000000..335a4023 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_plugins_maven_pmd_plugin_maven_plugin_3_13_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_plugins_maven_project_info_reports_plugin_maven_plugin_3_0_0.xml b/.idea/libraries/Maven__org_apache_maven_plugins_maven_project_info_reports_plugin_maven_plugin_3_0_0.xml new file mode 100644 index 00000000..460e8e70 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_plugins_maven_project_info_reports_plugin_maven_plugin_3_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_plugins_maven_site_plugin_maven_plugin_3_9_0.xml b/.idea/libraries/Maven__org_apache_maven_plugins_maven_site_plugin_maven_plugin_3_9_0.xml new file mode 100644 index 00000000..ba866ec4 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_plugins_maven_site_plugin_maven_plugin_3_9_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_plugins_maven_surefire_plugin_maven_plugin_2_22_2.xml b/.idea/libraries/Maven__org_apache_maven_plugins_maven_surefire_plugin_maven_plugin_2_22_2.xml new file mode 100644 index 00000000..24e56f32 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_plugins_maven_surefire_plugin_maven_plugin_2_22_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_plugins_maven_surefire_report_plugin_maven_plugin_3_0_0_M4.xml b/.idea/libraries/Maven__org_apache_maven_plugins_maven_surefire_report_plugin_maven_plugin_3_0_0_M4.xml new file mode 100644 index 00000000..c60bf44e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_plugins_maven_surefire_report_plugin_maven_plugin_3_0_0_M4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_reporting_maven_reporting_api_3_0.xml b/.idea/libraries/Maven__org_apache_maven_reporting_maven_reporting_api_3_0.xml new file mode 100644 index 00000000..a654238b --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_reporting_maven_reporting_api_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_reporting_maven_reporting_exec_1_4.xml b/.idea/libraries/Maven__org_apache_maven_reporting_maven_reporting_exec_1_4.xml new file mode 100644 index 00000000..b165a3cf --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_reporting_maven_reporting_exec_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_reporting_maven_reporting_impl_2_4.xml b/.idea/libraries/Maven__org_apache_maven_reporting_maven_reporting_impl_2_4.xml new file mode 100644 index 00000000..e055e8a8 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_reporting_maven_reporting_impl_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_resolver_maven_resolver_api_1_4_1.xml b/.idea/libraries/Maven__org_apache_maven_resolver_maven_resolver_api_1_4_1.xml new file mode 100644 index 00000000..7182feb4 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_resolver_maven_resolver_api_1_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_resolver_maven_resolver_util_1_4_1.xml b/.idea/libraries/Maven__org_apache_maven_resolver_maven_resolver_util_1_4_1.xml new file mode 100644 index 00000000..f122b75a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_resolver_maven_resolver_util_1_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_api_1_10_0.xml b/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_api_1_10_0.xml new file mode 100644 index 00000000..5c66cf1e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_api_1_10_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_manager_plexus_1_10_0.xml b/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_manager_plexus_1_10_0.xml new file mode 100644 index 00000000..5eba73fd --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_manager_plexus_1_10_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_cvs_commons_1_10_0.xml b/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_cvs_commons_1_10_0.xml new file mode 100644 index 00000000..b3482ed2 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_cvs_commons_1_10_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_cvsexe_1_10_0.xml b/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_cvsexe_1_10_0.xml new file mode 100644 index 00000000..7b099315 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_cvsexe_1_10_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_cvsjava_1_10_0.xml b/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_cvsjava_1_10_0.xml new file mode 100644 index 00000000..a9220217 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_cvsjava_1_10_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_git_commons_1_10_0.xml b/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_git_commons_1_10_0.xml new file mode 100644 index 00000000..3c2ec946 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_git_commons_1_10_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_gitexe_1_10_0.xml b/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_gitexe_1_10_0.xml new file mode 100644 index 00000000..d8d5c7f6 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_gitexe_1_10_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_hg_1_10_0.xml b/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_hg_1_10_0.xml new file mode 100644 index 00000000..32ab75af --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_hg_1_10_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_perforce_1_10_0.xml b/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_perforce_1_10_0.xml new file mode 100644 index 00000000..f688fb67 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_perforce_1_10_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_starteam_1_10_0.xml b/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_starteam_1_10_0.xml new file mode 100644 index 00000000..6c9ed52b --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_starteam_1_10_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_svn_commons_1_10_0.xml b/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_svn_commons_1_10_0.xml new file mode 100644 index 00000000..ecc00787 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_svn_commons_1_10_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_svnexe_1_10_0.xml b/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_svnexe_1_10_0.xml new file mode 100644 index 00000000..74bb6961 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_svnexe_1_10_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_shared_file_management_3_0_0.xml b/.idea/libraries/Maven__org_apache_maven_shared_file_management_3_0_0.xml new file mode 100644 index 00000000..af48a508 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_shared_file_management_3_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_shared_maven_artifact_transfer_0_11_0.xml b/.idea/libraries/Maven__org_apache_maven_shared_maven_artifact_transfer_0_11_0.xml new file mode 100644 index 00000000..9240dc64 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_shared_maven_artifact_transfer_0_11_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_shared_maven_common_artifact_filters_3_1_0.xml b/.idea/libraries/Maven__org_apache_maven_shared_maven_common_artifact_filters_3_1_0.xml new file mode 100644 index 00000000..ebb5bd7a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_shared_maven_common_artifact_filters_3_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_shared_maven_dependency_analyzer_1_11_1.xml b/.idea/libraries/Maven__org_apache_maven_shared_maven_dependency_analyzer_1_11_1.xml new file mode 100644 index 00000000..eae3a6af --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_shared_maven_dependency_analyzer_1_11_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_shared_maven_dependency_tree_3_0_1.xml b/.idea/libraries/Maven__org_apache_maven_shared_maven_dependency_tree_3_0_1.xml new file mode 100644 index 00000000..446ac4d0 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_shared_maven_dependency_tree_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_shared_maven_filtering_1_3.xml b/.idea/libraries/Maven__org_apache_maven_shared_maven_filtering_1_3.xml new file mode 100644 index 00000000..d33a5ad9 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_shared_maven_filtering_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_shared_maven_invoker_3_0_1.xml b/.idea/libraries/Maven__org_apache_maven_shared_maven_invoker_3_0_1.xml new file mode 100644 index 00000000..d70a3cfe --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_shared_maven_invoker_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_shared_maven_script_interpreter_1_2.xml b/.idea/libraries/Maven__org_apache_maven_shared_maven_script_interpreter_1_2.xml new file mode 100644 index 00000000..9e2d94f7 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_shared_maven_script_interpreter_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_shared_maven_shared_incremental_1_1.xml b/.idea/libraries/Maven__org_apache_maven_shared_maven_shared_incremental_1_1.xml new file mode 100644 index 00000000..86cb928e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_shared_maven_shared_incremental_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_shared_maven_shared_io_3_0_0.xml b/.idea/libraries/Maven__org_apache_maven_shared_maven_shared_io_3_0_0.xml new file mode 100644 index 00000000..9a2d6781 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_shared_maven_shared_io_3_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_shared_maven_shared_jar_1_2.xml b/.idea/libraries/Maven__org_apache_maven_shared_maven_shared_jar_1_2.xml new file mode 100644 index 00000000..5e5dfacb --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_shared_maven_shared_jar_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_shared_maven_shared_utils_3_2_1.xml b/.idea/libraries/Maven__org_apache_maven_shared_maven_shared_utils_3_2_1.xml new file mode 100644 index 00000000..72af5712 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_shared_maven_shared_utils_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_surefire_maven_surefire_common_2_22_2.xml b/.idea/libraries/Maven__org_apache_maven_surefire_maven_surefire_common_2_22_2.xml new file mode 100644 index 00000000..d8756000 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_surefire_maven_surefire_common_2_22_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_surefire_surefire_api_2_22_2.xml b/.idea/libraries/Maven__org_apache_maven_surefire_surefire_api_2_22_2.xml new file mode 100644 index 00000000..256a2f23 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_surefire_surefire_api_2_22_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_surefire_surefire_booter_2_22_2.xml b/.idea/libraries/Maven__org_apache_maven_surefire_surefire_booter_2_22_2.xml new file mode 100644 index 00000000..33359d49 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_surefire_surefire_booter_2_22_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_surefire_surefire_logger_api_3_0_0_M4.xml b/.idea/libraries/Maven__org_apache_maven_surefire_surefire_logger_api_3_0_0_M4.xml new file mode 100644 index 00000000..01638dc2 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_surefire_surefire_logger_api_3_0_0_M4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_surefire_surefire_report_parser_3_0_0_M4.xml b/.idea/libraries/Maven__org_apache_maven_surefire_surefire_report_parser_3_0_0_M4.xml new file mode 100644 index 00000000..2a088776 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_surefire_surefire_report_parser_3_0_0_M4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_wagon_wagon_http_lightweight_3_1_0.xml b/.idea/libraries/Maven__org_apache_maven_wagon_wagon_http_lightweight_3_1_0.xml new file mode 100644 index 00000000..dfd9682a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_wagon_wagon_http_lightweight_3_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_wagon_wagon_http_shared_3_1_0.xml b/.idea/libraries/Maven__org_apache_maven_wagon_wagon_http_shared_3_1_0.xml new file mode 100644 index 00000000..a44a6b80 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_wagon_wagon_http_shared_3_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_wagon_wagon_provider_api_3_3_1.xml b/.idea/libraries/Maven__org_apache_maven_wagon_wagon_provider_api_3_3_1.xml new file mode 100644 index 00000000..7d0e5776 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_wagon_wagon_provider_api_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_struts_struts_core_1_3_8.xml b/.idea/libraries/Maven__org_apache_struts_struts_core_1_3_8.xml new file mode 100644 index 00000000..072320e0 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_struts_struts_core_1_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_struts_struts_taglib_1_3_8.xml b/.idea/libraries/Maven__org_apache_struts_struts_taglib_1_3_8.xml new file mode 100644 index 00000000..9674c05e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_struts_struts_taglib_1_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_struts_struts_tiles_1_3_8.xml b/.idea/libraries/Maven__org_apache_struts_struts_tiles_1_3_8.xml new file mode 100644 index 00000000..e4c6c813 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_struts_struts_tiles_1_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_33.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_33.xml new file mode 100644 index 00000000..1e88c55a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_33.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_33.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_33.xml new file mode 100644 index 00000000..16bfd1eb --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_33.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_33.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_33.xml new file mode 100644 index 00000000..e61207b3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_33.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml b/.idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml new file mode 100644 index 00000000..7a2914a6 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_velocity_velocity_tools_2_0.xml b/.idea/libraries/Maven__org_apache_velocity_velocity_tools_2_0.xml new file mode 100644 index 00000000..2e6b0aaf --- /dev/null +++ b/.idea/libraries/Maven__org_apache_velocity_velocity_tools_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_ws_commons_ws_commons_util_1_0_1.xml b/.idea/libraries/Maven__org_apache_ws_commons_ws_commons_util_1_0_1.xml new file mode 100644 index 00000000..6e2ad19c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_ws_commons_ws_commons_util_1_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_ws_xmlschema_xmlschema_core_2_0_3.xml b/.idea/libraries/Maven__org_apache_ws_xmlschema_xmlschema_core_2_0_3.xml new file mode 100644 index 00000000..0b28957e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_ws_xmlschema_xmlschema_core_2_0_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xbean_xbean_reflect_3_7.xml b/.idea/libraries/Maven__org_apache_xbean_xbean_reflect_3_7.xml new file mode 100644 index 00000000..72b979eb --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xbean_xbean_reflect_3_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlrpc_xmlrpc_client_3_0.xml b/.idea/libraries/Maven__org_apache_xmlrpc_xmlrpc_client_3_0.xml new file mode 100644 index 00000000..becccce2 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlrpc_xmlrpc_client_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlrpc_xmlrpc_common_3_0.xml b/.idea/libraries/Maven__org_apache_xmlrpc_xmlrpc_common_3_0.xml new file mode 100644 index 00000000..5e5138f6 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlrpc_xmlrpc_common_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml new file mode 100644 index 00000000..f854ab00 --- /dev/null +++ b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_5.xml b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_5.xml new file mode 100644 index 00000000..1a387a4d --- /dev/null +++ b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_assertj_assertj_core_3_13_2.xml b/.idea/libraries/Maven__org_assertj_assertj_core_3_13_2.xml new file mode 100644 index 00000000..6222cc89 --- /dev/null +++ b/.idea/libraries/Maven__org_assertj_assertj_core_3_13_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml b/.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml new file mode 100644 index 00000000..5bad7db8 --- /dev/null +++ b/.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml b/.idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml new file mode 100644 index 00000000..d6f17aa7 --- /dev/null +++ b/.idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_checkerframework_checker_qual_2_10_0.xml b/.idea/libraries/Maven__org_checkerframework_checker_qual_2_10_0.xml new file mode 100644 index 00000000..23010542 --- /dev/null +++ b/.idea/libraries/Maven__org_checkerframework_checker_qual_2_10_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_groovy_groovy_2_5_10.xml b/.idea/libraries/Maven__org_codehaus_groovy_groovy_2_5_10.xml new file mode 100644 index 00000000..29757ab9 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_groovy_groovy_2_5_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_groovy_groovy_all_2_4_8.xml b/.idea/libraries/Maven__org_codehaus_groovy_groovy_all_2_4_8.xml new file mode 100644 index 00000000..e7241d77 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_groovy_groovy_all_2_4_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_groovy_groovy_ant_indy_3_0_2.xml b/.idea/libraries/Maven__org_codehaus_groovy_groovy_ant_indy_3_0_2.xml new file mode 100644 index 00000000..f9419525 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_groovy_groovy_ant_indy_3_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_groovy_groovy_cli_picocli_2_5_10.xml b/.idea/libraries/Maven__org_codehaus_groovy_groovy_cli_picocli_2_5_10.xml new file mode 100644 index 00000000..f47f9d9e --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_groovy_groovy_cli_picocli_2_5_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_groovy_groovy_dateutil_indy_3_0_2.xml b/.idea/libraries/Maven__org_codehaus_groovy_groovy_dateutil_indy_3_0_2.xml new file mode 100644 index 00000000..21e0a9c2 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_groovy_groovy_dateutil_indy_3_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_groovy_groovy_docgenerator_2_5_10.xml b/.idea/libraries/Maven__org_codehaus_groovy_groovy_docgenerator_2_5_10.xml new file mode 100644 index 00000000..c766f4c9 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_groovy_groovy_docgenerator_2_5_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_groovy_groovy_groovydoc_2_5_10.xml b/.idea/libraries/Maven__org_codehaus_groovy_groovy_groovydoc_2_5_10.xml new file mode 100644 index 00000000..2deddd20 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_groovy_groovy_groovydoc_2_5_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_groovy_groovy_indy_3_0_2.xml b/.idea/libraries/Maven__org_codehaus_groovy_groovy_indy_3_0_2.xml new file mode 100644 index 00000000..f8bb14b8 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_groovy_groovy_indy_3_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_groovy_groovy_templates_2_5_10.xml b/.idea/libraries/Maven__org_codehaus_groovy_groovy_templates_2_5_10.xml new file mode 100644 index 00000000..1ca79e8e --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_groovy_groovy_templates_2_5_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_groovy_groovy_xml_2_5_10.xml b/.idea/libraries/Maven__org_codehaus_groovy_groovy_xml_2_5_10.xml new file mode 100644 index 00000000..bf3cf6e4 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_groovy_groovy_xml_2_5_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_archiver_4_2_2.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_archiver_4_2_2.xml new file mode 100644 index 00000000..69a06d11 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_plexus_plexus_archiver_4_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_classworlds_2_5_2.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_classworlds_2_5_2.xml new file mode 100644 index 00000000..ff6091fb --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_plexus_plexus_classworlds_2_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_compiler_api_2_8_4.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_compiler_api_2_8_4.xml new file mode 100644 index 00000000..9afba754 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_plexus_plexus_compiler_api_2_8_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_compiler_javac_2_8_4.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_compiler_javac_2_8_4.xml new file mode 100644 index 00000000..cb401bb1 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_plexus_plexus_compiler_javac_2_8_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_compiler_manager_2_8_4.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_compiler_manager_2_8_4.xml new file mode 100644 index 00000000..c71fa920 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_plexus_plexus_compiler_manager_2_8_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_component_annotations_2_0_0.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_component_annotations_2_0_0.xml new file mode 100644 index 00000000..3b757bb4 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_plexus_plexus_component_annotations_2_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_container_default_2_1_0.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_container_default_2_1_0.xml new file mode 100644 index 00000000..1d0d67f2 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_plexus_plexus_container_default_2_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_digest_1_0.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_digest_1_0.xml new file mode 100644 index 00000000..8a32cec9 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_plexus_plexus_digest_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_i18n_1_0_beta_7.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_i18n_1_0_beta_7.xml new file mode 100644 index 00000000..95b0d3ca --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_plexus_plexus_i18n_1_0_beta_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_interpolation_1_26.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_interpolation_1_26.xml new file mode 100644 index 00000000..cdb2d874 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_plexus_plexus_interpolation_1_26.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_io_3_2_0.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_io_3_2_0.xml new file mode 100644 index 00000000..e73fe73a --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_plexus_plexus_io_3_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_java_0_9_10.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_java_0_9_10.xml new file mode 100644 index 00000000..b6b0c8ec --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_plexus_plexus_java_0_9_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_mail_sender_api_1_0_alpha_7.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_mail_sender_api_1_0_alpha_7.xml new file mode 100644 index 00000000..72b8083c --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_plexus_plexus_mail_sender_api_1_0_alpha_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_mail_sender_javamail_1_0_alpha_7.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_mail_sender_javamail_1_0_alpha_7.xml new file mode 100644 index 00000000..dbe996ed --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_plexus_plexus_mail_sender_javamail_1_0_alpha_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_mail_sender_simple_1_0_alpha_7.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_mail_sender_simple_1_0_alpha_7.xml new file mode 100644 index 00000000..7b8b6ee0 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_plexus_plexus_mail_sender_simple_1_0_alpha_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_resources_1_1_0.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_resources_1_1_0.xml new file mode 100644 index 00000000..f36723b7 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_plexus_plexus_resources_1_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_utils_3_3_0.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_utils_3_3_0.xml new file mode 100644 index 00000000..20854341 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_plexus_plexus_utils_3_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_velocity_1_2.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_velocity_1_2.xml new file mode 100644 index 00000000..55403132 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_plexus_plexus_velocity_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_1.xml b/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_1.xml new file mode 100644 index 00000000..3182f887 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_1_4.xml b/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_1_4.xml new file mode 100644 index 00000000..e14901f0 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dom4j_dom4j_2_1_1.xml b/.idea/libraries/Maven__org_dom4j_dom4j_2_1_1.xml new file mode 100644 index 00000000..6c8b371c --- /dev/null +++ b/.idea/libraries/Maven__org_dom4j_dom4j_2_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_aether_aether_util_0_9_0_M2.xml b/.idea/libraries/Maven__org_eclipse_aether_aether_util_0_9_0_M2.xml new file mode 100644 index 00000000..459a75f7 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_aether_aether_util_0_9_0_M2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_4_27_v20200227.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_4_27_v20200227.xml new file mode 100644 index 00000000..743982ea --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_4_27_v20200227.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_4_27_v20200227.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_4_27_v20200227.xml new file mode 100644 index 00000000..3fb3d904 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_4_27_v20200227.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_security_9_4_27_v20200227.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_security_9_4_27_v20200227.xml new file mode 100644 index 00000000..bae04e59 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_security_9_4_27_v20200227.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_server_9_4_27_v20200227.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_server_9_4_27_v20200227.xml new file mode 100644 index 00000000..e457ecc7 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_server_9_4_27_v20200227.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlet_9_4_27_v20200227.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlet_9_4_27_v20200227.xml new file mode 100644 index 00000000..b12e7736 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlet_9_4_27_v20200227.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_4_27_v20200227.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_4_27_v20200227.xml new file mode 100644 index 00000000..14568aa0 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_4_27_v20200227.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_webapp_9_4_27_v20200227.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_webapp_9_4_27_v20200227.xml new file mode 100644 index 00000000..2969b47d --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_webapp_9_4_27_v20200227.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_xml_9_4_27_v20200227.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_xml_9_4_27_v20200227.xml new file mode 100644 index 00000000..5e65e9d5 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_xml_9_4_27_v20200227.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_mylyn_github_org_eclipse_egit_github_core_2_1_5.xml b/.idea/libraries/Maven__org_eclipse_mylyn_github_org_eclipse_egit_github_core_2_1_5.xml new file mode 100644 index 00000000..f0686c95 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_mylyn_github_org_eclipse_egit_github_core_2_1_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_2.xml b/.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_2.xml new file mode 100644 index 00000000..dd040299 --- /dev/null +++ b/.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_2.xml b/.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_2.xml new file mode 100644 index 00000000..a0481f21 --- /dev/null +++ b/.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_2_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_2_1.xml new file mode 100644 index 00000000..b1702934 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_2_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_2_1.xml new file mode 100644 index 00000000..2456ee8d --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_1_0_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_1_0_Final.xml new file mode 100644 index 00000000..1fd775b5 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_5_4_12_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_5_4_12_Final.xml new file mode 100644 index 00000000..a81a97e0 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_5_4_12_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_18_Final.xml b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_18_Final.xml new file mode 100644 index 00000000..d035d9cd --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_18_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_iq80_snappy_snappy_0_4.xml b/.idea/libraries/Maven__org_iq80_snappy_snappy_0_4.xml new file mode 100644 index 00000000..b379bfa9 --- /dev/null +++ b/.idea/libraries/Maven__org_iq80_snappy_snappy_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_24_0_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_24_0_GA.xml new file mode 100644 index 00000000..a9de551c --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_24_0_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_2_1_1_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_2_1_1_Final.xml new file mode 100644 index 00000000..a8bf3587 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_2_1_1_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml new file mode 100644 index 00000000..0b76247c --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jsoup_jsoup_1_8_3.xml b/.idea/libraries/Maven__org_jsoup_jsoup_1_8_3.xml new file mode 100644 index 00000000..de00ad0e --- /dev/null +++ b/.idea/libraries/Maven__org_jsoup_jsoup_1_8_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_5_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_5_2.xml new file mode 100644 index 00000000..5db07403 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_5_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_5_2.xml new file mode 100644 index 00000000..8fbc8ce2 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_5_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_5_2.xml new file mode 100644 index 00000000..cca5485d --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_5_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_5_2.xml new file mode 100644 index 00000000..e2713d08 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_5_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_5_2.xml new file mode 100644 index 00000000..4192cdcd --- /dev/null +++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_5_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_5_2.xml new file mode 100644 index 00000000..cbbd9b77 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jvnet_staxex_stax_ex_1_8_1.xml b/.idea/libraries/Maven__org_jvnet_staxex_stax_ex_1_8_1.xml new file mode 100644 index 00000000..38f7e124 --- /dev/null +++ b/.idea/libraries/Maven__org_jvnet_staxex_stax_ex_1_8_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_3_1_0.xml b/.idea/libraries/Maven__org_mockito_mockito_core_3_1_0.xml new file mode 100644 index 00000000..c18526d0 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_3_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_1_0.xml b/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_1_0.xml new file mode 100644 index 00000000..d4e66431 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mozilla_rhino_1_7_7_2.xml b/.idea/libraries/Maven__org_mozilla_rhino_1_7_7_2.xml new file mode 100644 index 00000000..7d5819b6 --- /dev/null +++ b/.idea/libraries/Maven__org_mozilla_rhino_1_7_7_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_netbeans_lib_cvsclient_20060125.xml b/.idea/libraries/Maven__org_netbeans_lib_cvsclient_20060125.xml new file mode 100644 index 00000000..ec7897a1 --- /dev/null +++ b/.idea/libraries/Maven__org_netbeans_lib_cvsclient_20060125.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_nibor_autolink_autolink_0_6_0.xml b/.idea/libraries/Maven__org_nibor_autolink_autolink_0_6_0.xml new file mode 100644 index 00000000..90d8f2b4 --- /dev/null +++ b/.idea/libraries/Maven__org_nibor_autolink_autolink_0_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml b/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml new file mode 100644 index 00000000..af41e3b6 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml new file mode 100644 index 00000000..fbc1b163 --- /dev/null +++ b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_7_3_1.xml b/.idea/libraries/Maven__org_ow2_asm_asm_7_3_1.xml new file mode 100644 index 00000000..814416dd --- /dev/null +++ b/.idea/libraries/Maven__org_ow2_asm_asm_7_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_analysis_7_3_1.xml b/.idea/libraries/Maven__org_ow2_asm_asm_analysis_7_3_1.xml new file mode 100644 index 00000000..ce864004 --- /dev/null +++ b/.idea/libraries/Maven__org_ow2_asm_asm_analysis_7_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_commons_7_3_1.xml b/.idea/libraries/Maven__org_ow2_asm_asm_commons_7_3_1.xml new file mode 100644 index 00000000..004af88f --- /dev/null +++ b/.idea/libraries/Maven__org_ow2_asm_asm_commons_7_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_tree_7_3_1.xml b/.idea/libraries/Maven__org_ow2_asm_asm_tree_7_3_1.xml new file mode 100644 index 00000000..45cd3cdb --- /dev/null +++ b/.idea/libraries/Maven__org_ow2_asm_asm_tree_7_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_util_7_3_1.xml b/.idea/libraries/Maven__org_ow2_asm_asm_util_7_3_1.xml new file mode 100644 index 00000000..c5fe2383 --- /dev/null +++ b/.idea/libraries/Maven__org_ow2_asm_asm_util_7_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_postgresql_postgresql_42_2_11.xml b/.idea/libraries/Maven__org_postgresql_postgresql_42_2_11.xml new file mode 100644 index 00000000..cac4cab0 --- /dev/null +++ b/.idea/libraries/Maven__org_postgresql_postgresql_42_2_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_12.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_12.xml new file mode 100644 index 00000000..46cf8a8e --- /dev/null +++ b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml new file mode 100644 index 00000000..c4c54d6d --- /dev/null +++ b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml new file mode 100644 index 00000000..27229ce3 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml new file mode 100644 index 00000000..02b6812c --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_simple_1_7_30.xml b/.idea/libraries/Maven__org_slf4j_slf4j_simple_1_7_30.xml new file mode 100644 index 00000000..e5856a03 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_simple_1_7_30.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_sonatype_aether_aether_api_1_7.xml b/.idea/libraries/Maven__org_sonatype_aether_aether_api_1_7.xml new file mode 100644 index 00000000..13888169 --- /dev/null +++ b/.idea/libraries/Maven__org_sonatype_aether_aether_api_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_sonatype_aether_aether_impl_1_7.xml b/.idea/libraries/Maven__org_sonatype_aether_aether_impl_1_7.xml new file mode 100644 index 00000000..508e3f40 --- /dev/null +++ b/.idea/libraries/Maven__org_sonatype_aether_aether_impl_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_sonatype_aether_aether_spi_1_7.xml b/.idea/libraries/Maven__org_sonatype_aether_aether_spi_1_7.xml new file mode 100644 index 00000000..d75c8379 --- /dev/null +++ b/.idea/libraries/Maven__org_sonatype_aether_aether_spi_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_sonatype_aether_aether_util_1_7.xml b/.idea/libraries/Maven__org_sonatype_aether_aether_util_1_7.xml new file mode 100644 index 00000000..47b2dc90 --- /dev/null +++ b/.idea/libraries/Maven__org_sonatype_aether_aether_util_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_sonatype_plexus_plexus_build_api_0_0_7.xml b/.idea/libraries/Maven__org_sonatype_plexus_plexus_build_api_0_0_7.xml new file mode 100644 index 00000000..9302938e --- /dev/null +++ b/.idea/libraries/Maven__org_sonatype_plexus_plexus_build_api_0_0_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_sonatype_plexus_plexus_cipher_1_4.xml b/.idea/libraries/Maven__org_sonatype_plexus_plexus_cipher_1_4.xml new file mode 100644 index 00000000..7316193d --- /dev/null +++ b/.idea/libraries/Maven__org_sonatype_plexus_plexus_cipher_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_sonatype_plexus_plexus_sec_dispatcher_1_3.xml b/.idea/libraries/Maven__org_sonatype_plexus_plexus_sec_dispatcher_1_3.xml new file mode 100644 index 00000000..bb61d0e6 --- /dev/null +++ b/.idea/libraries/Maven__org_sonatype_plexus_plexus_sec_dispatcher_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_sonatype_sisu_sisu_guice_noaop_2_1_7.xml b/.idea/libraries/Maven__org_sonatype_sisu_sisu_guice_noaop_2_1_7.xml new file mode 100644 index 00000000..b722b5a6 --- /dev/null +++ b/.idea/libraries/Maven__org_sonatype_sisu_sisu_guice_noaop_2_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_sonatype_sisu_sisu_inject_bean_1_4_2.xml b/.idea/libraries/Maven__org_sonatype_sisu_sisu_inject_bean_1_4_2.xml new file mode 100644 index 00000000..67fb8805 --- /dev/null +++ b/.idea/libraries/Maven__org_sonatype_sisu_sisu_inject_bean_1_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_sonatype_sisu_sisu_inject_plexus_1_4_2.xml b/.idea/libraries/Maven__org_sonatype_sisu_sisu_inject_plexus_1_4_2.xml new file mode 100644 index 00000000..714626a1 --- /dev/null +++ b/.idea/libraries/Maven__org_sonatype_sisu_sisu_inject_plexus_1_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_2_6_RELEASE.xml new file mode 100644 index 00000000..35e80377 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_2_6_RELEASE.xml new file mode 100644 index 00000000..5b60c93b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_metadata_2_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_metadata_2_2_6_RELEASE.xml new file mode 100644 index 00000000..f4b65ce5 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_metadata_2_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_processor_2_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_processor_2_2_6_RELEASE.xml new file mode 100644 index 00000000..e93b2169 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_processor_2_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_2_6_RELEASE.xml new file mode 100644 index 00000000..4e3f6ef5 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_loader_tools_2_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_loader_tools_2_2_6_RELEASE.xml new file mode 100644 index 00000000..3056026f --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_loader_tools_2_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_maven_plugin_maven_plugin_2_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_maven_plugin_maven_plugin_2_2_6_RELEASE.xml new file mode 100644 index 00000000..47c45e48 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_maven_plugin_maven_plugin_2_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_properties_migrator_2_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_properties_migrator_2_2_6_RELEASE.xml new file mode 100644 index 00000000..3ab6e92b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_properties_migrator_2_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_2_6_RELEASE.xml new file mode 100644 index 00000000..20e8b4f5 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_2_6_RELEASE.xml new file mode 100644 index 00000000..9c842573 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_2_6_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_2_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_2_6_RELEASE.xml new file mode 100644 index 00000000..0a32cfb0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_2_6_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_2_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_2_6_RELEASE.xml new file mode 100644 index 00000000..f8b1c7cc --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_2_6_RELEASE.xml new file mode 100644 index 00000000..94147d6c --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_2_6_RELEASE.xml new file mode 100644 index 00000000..cee45df0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_mail_2_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_mail_2_2_6_RELEASE.xml new file mode 100644 index 00000000..ea443310 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_mail_2_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_2_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_2_2_6_RELEASE.xml new file mode 100644 index 00000000..9b5f6b5e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_2_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_2_6_RELEASE.xml new file mode 100644 index 00000000..5be67a68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_2_6_RELEASE.xml new file mode 100644 index 00000000..a7b0e20f --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_2_6_RELEASE.xml new file mode 100644 index 00000000..960a99f2 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_2_6_RELEASE.xml new file mode 100644 index 00000000..fa682045 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_2_6_RELEASE.xml new file mode 100644 index 00000000..3e807b06 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_2_6_RELEASE.xml new file mode 100644 index 00000000..ea379592 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_2_6_RELEASE.xml new file mode 100644 index 00000000..c8fab5d5 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_2_6_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_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_2_6_RELEASE.xml new file mode 100644 index 00000000..6136f0d4 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_2_6_RELEASE.xml new file mode 100644 index 00000000..b750d6eb --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_config_5_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_config_5_2_2_RELEASE.xml new file mode 100644 index 00000000..fb43499f --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_security_spring_security_config_5_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_core_5_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_core_5_2_2_RELEASE.xml new file mode 100644 index 00000000..a3510235 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_security_spring_security_core_5_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_data_5_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_data_5_2_2_RELEASE.xml new file mode 100644 index 00000000..61cd1b9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_security_spring_security_data_5_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_remoting_5_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_remoting_5_2_2_RELEASE.xml new file mode 100644 index 00000000..5c7cb883 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_security_spring_security_remoting_5_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_test_5_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_test_5_2_2_RELEASE.xml new file mode 100644 index 00000000..496d50ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_security_spring_security_test_5_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_web_5_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_web_5_2_2_RELEASE.xml new file mode 100644 index 00000000..2dd17f26 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_security_spring_security_web_5_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_session_spring_session_core_2_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_session_spring_session_core_2_2_2_RELEASE.xml new file mode 100644 index 00000000..da2f84dc --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_session_spring_session_core_2_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_session_spring_session_jdbc_2_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_session_spring_session_jdbc_2_2_2_RELEASE.xml new file mode 100644 index 00000000..f5405962 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_session_spring_session_jdbc_2_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_5_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_5_2_5_RELEASE.xml new file mode 100644 index 00000000..13397380 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_5_2_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aspects_5_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aspects_5_2_5_RELEASE.xml new file mode 100644 index 00000000..10a865f4 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aspects_5_2_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_5_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_5_2_5_RELEASE.xml new file mode 100644 index 00000000..97d38e86 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_5_2_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_5_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_5_2_5_RELEASE.xml new file mode 100644 index 00000000..65e18f73 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_5_2_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_5_RELEASE.xml new file mode 100644 index 00000000..18538125 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_5_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_5_2_5_RELEASE.xml new file mode 100644 index 00000000..9901cb97 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_5_2_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_5_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_5_2_5_RELEASE.xml new file mode 100644 index 00000000..dd19707e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_5_2_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_5_RELEASE.xml new file mode 100644 index 00000000..b1ffa91a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_5_RELEASE.xml new file mode 100644 index 00000000..cd9097ad --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_5_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_5_2_5_RELEASE.xml new file mode 100644 index 00000000..05993e2c --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_5_2_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_5_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_5_2_5_RELEASE.xml new file mode 100644 index 00000000..ad47fa36 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_5_2_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_5_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_5_2_5_RELEASE.xml new file mode 100644 index 00000000..97a3dce4 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_5_2_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_5_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_5_2_5_RELEASE.xml new file mode 100644 index 00000000..36a90f56 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_5_2_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_5_RELEASE.xml new file mode 100644 index 00000000..a1ca211e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_4_RELEASE.xml b/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_4_RELEASE.xml new file mode 100644 index 00000000..7b246ae1 --- /dev/null +++ b/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_4_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_springsecurity5_3_0_4_RELEASE.xml b/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_springsecurity5_3_0_4_RELEASE.xml new file mode 100644 index 00000000..dbdddb53 --- /dev/null +++ b/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_springsecurity5_3_0_4_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_11_RELEASE.xml b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_11_RELEASE.xml new file mode 100644 index 00000000..7b72babd --- /dev/null +++ b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_11_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_11_RELEASE.xml b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_11_RELEASE.xml new file mode 100644 index 00000000..3370587a --- /dev/null +++ b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_11_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_thymeleaf_thymeleaf_testing_3_0_4_RELEASE.xml b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_testing_3_0_4_RELEASE.xml new file mode 100644 index 00000000..c2307d66 --- /dev/null +++ b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_testing_3_0_4_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_tukaani_xz_1_8.xml b/.idea/libraries/Maven__org_tukaani_xz_1_8.xml new file mode 100644 index 00000000..6f7b1fb2 --- /dev/null +++ b/.idea/libraries/Maven__org_tukaani_xz_1_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml b/.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml new file mode 100644 index 00000000..2334aa05 --- /dev/null +++ b/.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_webjars_bootstrap_4_4_1_1.xml b/.idea/libraries/Maven__org_webjars_bootstrap_4_4_1_1.xml new file mode 100644 index 00000000..16ee44ef --- /dev/null +++ b/.idea/libraries/Maven__org_webjars_bootstrap_4_4_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_webjars_ckeditor_4_14_0.xml b/.idea/libraries/Maven__org_webjars_ckeditor_4_14_0.xml new file mode 100644 index 00000000..a96e07af --- /dev/null +++ b/.idea/libraries/Maven__org_webjars_ckeditor_4_14_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_webjars_font_awesome_5_13_0.xml b/.idea/libraries/Maven__org_webjars_font_awesome_5_13_0.xml new file mode 100644 index 00000000..c20b8df9 --- /dev/null +++ b/.idea/libraries/Maven__org_webjars_font_awesome_5_13_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_webjars_jquery_3_4_1.xml b/.idea/libraries/Maven__org_webjars_jquery_3_4_1.xml new file mode 100644 index 00000000..09b6eb41 --- /dev/null +++ b/.idea/libraries/Maven__org_webjars_jquery_3_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_webjars_popper_js_1_14_3.xml b/.idea/libraries/Maven__org_webjars_popper_js_1_14_3.xml new file mode 100644 index 00000000..52ae3e6c --- /dev/null +++ b/.idea/libraries/Maven__org_webjars_popper_js_1_14_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_4.xml b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_4.xml new file mode 100644 index 00000000..13230150 --- /dev/null +++ b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_25.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_25.xml new file mode 100644 index 00000000..495fc06f --- /dev/null +++ b/.idea/libraries/Maven__org_yaml_snakeyaml_1_25.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__oro_oro_2_0_8.xml b/.idea/libraries/Maven__oro_oro_2_0_8.xml new file mode 100644 index 00000000..25203a04 --- /dev/null +++ b/.idea/libraries/Maven__oro_oro_2_0_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__rome_rome_1_0.xml b/.idea/libraries/Maven__rome_rome_1_0.xml new file mode 100644 index 00000000..ca0e345b --- /dev/null +++ b/.idea/libraries/Maven__rome_rome_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__sslext_sslext_1_2_0.xml b/.idea/libraries/Maven__sslext_sslext_1_2_0.xml new file mode 100644 index 00000000..e8c78314 --- /dev/null +++ b/.idea/libraries/Maven__sslext_sslext_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__wsdl4j_wsdl4j_1_6_3.xml b/.idea/libraries/Maven__wsdl4j_wsdl4j_1_6_3.xml new file mode 100644 index 00000000..8310dc88 --- /dev/null +++ b/.idea/libraries/Maven__wsdl4j_wsdl4j_1_6_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__xalan_xalan_2_7_0.xml b/.idea/libraries/Maven__xalan_xalan_2_7_0.xml new file mode 100644 index 00000000..dd647b42 --- /dev/null +++ b/.idea/libraries/Maven__xalan_xalan_2_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__xerces_xercesImpl_2_9_1.xml b/.idea/libraries/Maven__xerces_xercesImpl_2_9_1.xml new file mode 100644 index 00000000..19d39dba --- /dev/null +++ b/.idea/libraries/Maven__xerces_xercesImpl_2_9_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml b/.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml new file mode 100644 index 00000000..c36e7171 --- /dev/null +++ b/.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..03c026d5 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 00000000..e96534fb --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/validation.xml b/.idea/validation.xml new file mode 100644 index 00000000..8e86b7df --- /dev/null +++ b/.idea/validation.xml @@ -0,0 +1,20 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/etc/TODO.md b/etc/TODO.md index ab41c606..d161abce 100644 --- a/etc/TODO.md +++ b/etc/TODO.md @@ -56,7 +56,7 @@ Errorpage - Refer to logfile: 2020-04-03 14:30:58.586 WARN 2864 --- [nio-8080-exec-8] .w.s.m.s.DefaultHandlerExceptionResolver : Resolved [org.springframework.web.HttpRequestMethodNotSupportedException: Request method 'POST' not supported] 2020-04-03 14:30:58.586 DEBUG 2864 --- [nio-8080-exec-8] o.s.web.servlet.DispatcherServlet : Completed 405 METHOD_NOT_ALLOWED 2020-04-03 14:30:58.590 DEBUG 2864 --- [nio-8080-exec-8] o.s.web.servlet.DispatcherServlet : "ERROR" dispatch for POST "/fehler", parameters={masked} -2020-04-03 14:30:58.590 DEBUG 2864 --- [nio-8080-exec-8] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped to org.woehlke.simpleworklist.error.MyErrorController#handleError(HttpServletRequest, Model) +2020-04-03 14:30:58.590 DEBUG 2864 --- [nio-8080-exec-8] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped to org.woehlke.simpleworklist.application.error.MyErrorController#handleError(HttpServletRequest, Model) 2020-04-03 14:30:58.591 WARN 2864 --- [nio-8080-exec-8] o.w.s.error.MyErrorController : errorMessage :Request method 'POST' not supported 2020-04-03 14:30:58.591 WARN 2864 --- [nio-8080-exec-8] o.w.s.error.MyErrorController : 405Method Not Allowed 2020-04-03 14:30:58.593 DEBUG 2864 --- [nio-8080-exec-8] o.s.web.servlet.DispatcherServlet : Exiting from "ERROR" dispatch, status 405 @@ -98,3 +98,11 @@ https://github.com/thymeleaf/thymeleaf-testing # 2.3.16 Fixed #169, Fixed #170, Fixed #171, Fixed #172, Fixed #183 + + +# 2.3.17 +Fixed #223, Fixed #224, Fixed #225, Fixed #226, Fixed #227, Fixed #228, Fixed #229, Fixed #230, Fixed #231, Fixed #232, Fixed #233 + +Fixed #201, Fixed #202, Fixed #203, Fixed #204, Fixed #205, Fixed #206, Fixed #207, Fixed #208, Fixed #209, Fixed #210, Fixed #211, Fixed #212, Fixed #213, Fixed #214, Fixed #215, Fixed #216, Fixed #217, Fixed #218, Fixed #219 + +Fixed #220, Fixed #221, Fixed #222 diff --git a/etc/requirements/Requirements.md b/etc/requirements/Requirements.md index e457edfb..280b5421 100644 --- a/etc/requirements/Requirements.md +++ b/etc/requirements/Requirements.md @@ -31,34 +31,37 @@ ## F031 Taskstate: Add Task to Inbox again ## F032 Taskstate: Task Edit ## F033 Taskstate: Task Edit Form -> change Taskstate via DropDown -## F034 Taskstate: Task Edit Form -> transform to Project -## F035 Taskstate: Task setFocus -## F036 Taskstate: Task unSetFocus -## F037 Taskstate: Task complete -## F038 Taskstate: Task incomplete -## F039 Taskstate: Task delete -## F040 Taskstate: Task undelete +## F054 Taskstate: Task Edit Form -> change Project via DropDown +## F035 Taskstate: Task Edit Form -> transform to Project +## F036 Taskstate: Task setFocus +## F037 Taskstate: Task unSetFocus +## F038 Taskstate: Task complete +## F039 Taskstate: Task incomplete +## F040 Taskstate: Task delete +## F041 Taskstate: Task undelete ## F050 Project/Root: Add Task ## F051 Project/Root: Add SubProject ## F052 Project/Root: Task Edit ## F053 Project/Root: Task Edit Form -> change Taskstate via DropDown -## F054 Project/Root: Task Edit Form -> transform to Project -## F055 Project/Root: Task setFocus -## F056 Project/Root: Task unSetFocus -## F057 Project/Root: Task complete -## F058 Project/Root: Task incomplete -## F059 Project/Root: Task delete -## F060 Project/Root: Task undelete +## F054 Project/Root: Task Edit Form -> change Project via DropDown +## F055 Project/Root: Task Edit Form -> transform to Project +## F056 Project/Root: Task setFocus +## F057 Project/Root: Task unSetFocus +## F058 Project/Root: Task complete +## F059 Project/Root: Task incomplete +## F060 Project/Root: Task delete +## F061 Project/Root: Task undelete ## F070 Project/id: Add Task ## F071 Project/id: Add SubProject ## F072 Project/id: Task Edit ## F073 Project/id: Task Edit Form -> change Taskstate via DropDown -## F074 Project/id: Task Edit Form -> transform to Project -## F075 Project/id: Task setFocus -## F076 Project/id: Task unSetFocus -## F077 Project/id: Task complete -## F078 Project/id: Task incomplete -## F079 Project/id: Task delete -## F080 Project/id: Task undelete +## F074 Project/id: Task Edit Form -> change Project via DropDown +## F075 Project/id: Task Edit Form -> transform to Project +## F076 Project/id: Task setFocus +## F077 Project/id: Task unSetFocus +## F078 Project/id: Task complete +## F079 Project/id: Task incomplete +## F080 Project/id: Task delete +## F081 Project/id: Task undelete diff --git a/etc/serialversions/getserialversionid.cmd b/etc/serialversions/getserialversionid.cmd index f6356f93..6d3bf39b 100644 --- a/etc/serialversions/getserialversionid.cmd +++ b/etc/serialversions/getserialversionid.cmd @@ -15,34 +15,34 @@ set MY_CLASSPATH_APP=%JAVA_HOME%\jre\lib\rt.jar;%CD%\target\classes set CLASSPATH=%MY_CLASSPATH_APP%;%MY_CLASSPATH_DEPS% echo %CLASSPATH% cd target\classes -serialver org.woehlke.simpleworklist.language.Language > ..\..\etc\serialversions.txt +serialver org.woehlke.simpleworklist.application.language.Language > ..\..\etc\serialversions.txt serialver org.woehlke.simpleworklist.task.TaskEnergy >> ..\..\etc\serialversions.txt serialver org.woehlke.simpleworklist.task.TaskState >> ..\..\etc\serialversions.txt serialver org.woehlke.simpleworklist.task.TaskTime >> ..\..\etc\serialversions.txt serialver org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecoveryStatus >> ..\..\etc\serialversions.txt serialver org.woehlke.simpleworklist.user.register.UserRegistrationStatus >> ..\..\etc\serialversions.txt serialver org.woehlke.simpleworklist.user.account.UserRole >> ..\..\etc\serialversions.txt -serialver org.woehlke.simpleworklist.common.AuditModel >> ..\..\etc\serialversions.txt +serialver org.woehlke.simpleworklist.application.common.AuditModel >> ..\..\etc\serialversions.txt serialver org.woehlke.simpleworklist.context.Context >> ..\..\etc\serialversions.txt serialver org.woehlke.simpleworklist.project.Project >> ..\..\etc\serialversions.txt serialver org.woehlke.simpleworklist.task.Task >> ..\..\etc\serialversions.txt -serialver org.woehlke.simpleworklist.user.messages.User2UserMessage >> ..\..\etc\serialversions.txt +serialver org.woehlke.simpleworklist.user.chat.User2UserMessage >> ..\..\etc\serialversions.txt serialver org.woehlke.simpleworklist.user.account.UserAccount >> ..\..\etc\serialversions.txt serialver org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecovery >> ..\..\etc\serialversions.txt serialver org.woehlke.simpleworklist.user.register.UserRegistration >> ..\..\etc\serialversions.txt -serialver org.woehlke.simpleworklist.breadcrumb.BreadcrumbItem >> ..\..\etc\serialversions.txt -serialver org.woehlke.simpleworklist.breadcrumb.Breadcrumb >> ..\..\etc\serialversions.txt +serialver org.woehlke.simpleworklist.application.breadcrumb.BreadcrumbItem >> ..\..\etc\serialversions.txt +serialver org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb >> ..\..\etc\serialversions.txt serialver org.woehlke.simpleworklist.user.login.LoginForm >> ..\..\etc\serialversions.txt serialver org.woehlke.simpleworklist.context.NewContextForm >> ..\..\etc\serialversions.txt -serialver org.woehlke.simpleworklist.user.messages.User2UserMessageFormBean >> ..\..\etc\serialversions.txt +serialver org.woehlke.simpleworklist.user.chat.User2UserMessageFormBean >> ..\..\etc\serialversions.txt serialver org.woehlke.simpleworklist.searchRequest.SearchResult >> ..\..\etc\serialversions.txt serialver org.woehlke.simpleworklist.user.account.UserAccountForm >> ..\..\etc\serialversions.txt serialver org.woehlke.simpleworklist.context.UserChangeDefaultContextForm >> ..\..\etc\serialversions.txt -serialver org.woehlke.simpleworklist.language.UserChangeLanguageForm >> ..\..\etc\serialversions.txt +serialver org.woehlke.simpleworklist.application.language.UserChangeLanguageForm >> ..\..\etc\serialversions.txt serialver org.woehlke.simpleworklist.user.selfservice.UserChangeNameForm >> ..\..\etc\serialversions.txt serialver org.woehlke.simpleworklist.user.selfservice.UserChangePasswordForm >> ..\..\etc\serialversions.txt @rem serialver org.woehlke.simpleworklist.user.account.UserDetailsBean >> ..\..\etc\serialversions.txt serialver org.woehlke.simpleworklist.user.register.UserRegistrationForm >> ..\..\etc\serialversions.txt -serialver org.woehlke.simpleworklist.session.UserSessionBean >> ..\..\etc\serialversions.txt +serialver org.woehlke.simpleworklist.user.session.UserSessionBean >> ..\..\etc\serialversions.txt cd ..\.. echo FINISHED diff --git a/etc/serialversions/serialversions.txt b/etc/serialversions/serialversions.txt index 14da4161..c0eee59b 100644 --- a/etc/serialversions/serialversions.txt +++ b/etc/serialversions/serialversions.txt @@ -1,28 +1,28 @@ -org.woehlke.simpleworklist.language.Language: private static final long serialVersionUID = 0L; +org.woehlke.simpleworklist.application.language.Language: private static final long serialVersionUID = 0L; org.woehlke.simpleworklist.task.TaskEnergy: private static final long serialVersionUID = 0L; org.woehlke.simpleworklist.task.TaskState: private static final long serialVersionUID = 0L; org.woehlke.simpleworklist.task.TaskTime: private static final long serialVersionUID = 0L; org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecoveryStatus: private static final long serialVersionUID = 0L; org.woehlke.simpleworklist.user.register.UserRegistrationStatus: private static final long serialVersionUID = 0L; org.woehlke.simpleworklist.user.account.UserRole: private static final long serialVersionUID = 0L; -org.woehlke.simpleworklist.common.AuditModel: private static final long serialVersionUID = 4399373914714726911L; +org.woehlke.simpleworklist.application.common.AuditModel: private static final long serialVersionUID = 4399373914714726911L; org.woehlke.simpleworklist.context.Context: private static final long serialVersionUID = -5035732370606951871L; org.woehlke.simpleworklist.project.Project: private static final long serialVersionUID = 4566653175832872422L; org.woehlke.simpleworklist.task.Task: private static final long serialVersionUID = 5247710652586269801L; -org.woehlke.simpleworklist.user.messages.User2UserMessage: private static final long serialVersionUID = 4263078228257938175L; +org.woehlke.simpleworklist.user.chat.User2UserMessage: private static final long serialVersionUID = 4263078228257938175L; org.woehlke.simpleworklist.user.account.UserAccount: private static final long serialVersionUID = 7860692526488291439L; org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecovery: private static final long serialVersionUID = 6860716425733119940L; org.woehlke.simpleworklist.user.register.UserRegistration: private static final long serialVersionUID = -1955967514018161878L; -org.woehlke.simpleworklist.breadcrumb.BreadcrumbItem: private static final long serialVersionUID = 8276819198016077167L; -org.woehlke.simpleworklist.breadcrumb.Breadcrumb: private static final long serialVersionUID = 7932703111140692689L; +org.woehlke.simpleworklist.application.breadcrumb.BreadcrumbItem: private static final long serialVersionUID = 8276819198016077167L; +org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb: private static final long serialVersionUID = 7932703111140692689L; org.woehlke.simpleworklist.user.login.LoginForm: private static final long serialVersionUID = 5936886560348238355L; org.woehlke.simpleworklist.context.NewContextForm: private static final long serialVersionUID = -937143305653156981L; -org.woehlke.simpleworklist.user.messages.User2UserMessageFormBean: private static final long serialVersionUID = 1576610181966480168L; +org.woehlke.simpleworklist.user.chat.User2UserMessageFormBean: private static final long serialVersionUID = 1576610181966480168L; org.woehlke.simpleworklist.searchRequest.SearchResult: private static final long serialVersionUID = 1682809351146047764L; org.woehlke.simpleworklist.user.account.UserAccountForm: private static final long serialVersionUID = 9180383385243540190L; org.woehlke.simpleworklist.context.UserChangeDefaultContextForm: private static final long serialVersionUID = -8592295563275083292L; -org.woehlke.simpleworklist.language.UserChangeLanguageForm: private static final long serialVersionUID = 2201123162578113187L; +org.woehlke.simpleworklist.application.language.UserChangeLanguageForm: private static final long serialVersionUID = 2201123162578113187L; org.woehlke.simpleworklist.user.selfservice.UserChangeNameForm: private static final long serialVersionUID = 5120488382888268418L; org.woehlke.simpleworklist.user.selfservice.UserChangePasswordForm: private static final long serialVersionUID = 9149342594823222054L; org.woehlke.simpleworklist.user.register.UserRegistrationForm: private static final long serialVersionUID = 6864871862706880939L; -org.woehlke.simpleworklist.session.UserSessionBean: private static final long serialVersionUID = -6649686058228455825L; +org.woehlke.simpleworklist.user.session.UserSessionBean: private static final long serialVersionUID = -6649686058228455825L; diff --git a/pom.xml b/pom.xml index c1ac5d90..f021115b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.woehlke simpleworklist - 2.3.16-SNAPSHOT + 2.3.18-SNAPSHOT jar org.springframework.boot diff --git a/src/main/java/org/woehlke/simpleworklist/SimpleworklistApplication.java b/src/main/java/org/woehlke/simpleworklist/SimpleworklistApplication.java index e13fdaa8..8d41fd39 100644 --- a/src/main/java/org/woehlke/simpleworklist/SimpleworklistApplication.java +++ b/src/main/java/org/woehlke/simpleworklist/SimpleworklistApplication.java @@ -4,9 +4,9 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.woehlke.simpleworklist.config.ApplicationProperties; -import org.woehlke.simpleworklist.config.di.WebMvcConfig; -import org.woehlke.simpleworklist.config.di.WebSecurityConfig; +import org.woehlke.simpleworklist.application.ApplicationProperties; +import org.woehlke.simpleworklist.application.config.WebMvcConfig; +import org.woehlke.simpleworklist.application.config.WebSecurityConfig; @ImportAutoConfiguration({ diff --git a/src/main/java/org/woehlke/simpleworklist/config/ApplicationProperties.java b/src/main/java/org/woehlke/simpleworklist/application/ApplicationProperties.java similarity index 98% rename from src/main/java/org/woehlke/simpleworklist/config/ApplicationProperties.java rename to src/main/java/org/woehlke/simpleworklist/application/ApplicationProperties.java index d021948a..fecead3c 100644 --- a/src/main/java/org/woehlke/simpleworklist/config/ApplicationProperties.java +++ b/src/main/java/org/woehlke/simpleworklist/application/ApplicationProperties.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.config; +package org.woehlke.simpleworklist.application; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/org/woehlke/simpleworklist/breadcrumb/Breadcrumb.java b/src/main/java/org/woehlke/simpleworklist/application/breadcrumb/Breadcrumb.java similarity index 97% rename from src/main/java/org/woehlke/simpleworklist/breadcrumb/Breadcrumb.java rename to src/main/java/org/woehlke/simpleworklist/application/breadcrumb/Breadcrumb.java index 57e62f4b..d8b02848 100644 --- a/src/main/java/org/woehlke/simpleworklist/breadcrumb/Breadcrumb.java +++ b/src/main/java/org/woehlke/simpleworklist/application/breadcrumb/Breadcrumb.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.breadcrumb; +package org.woehlke.simpleworklist.application.breadcrumb; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/src/main/java/org/woehlke/simpleworklist/breadcrumb/BreadcrumbItem.java b/src/main/java/org/woehlke/simpleworklist/application/breadcrumb/BreadcrumbItem.java similarity index 87% rename from src/main/java/org/woehlke/simpleworklist/breadcrumb/BreadcrumbItem.java rename to src/main/java/org/woehlke/simpleworklist/application/breadcrumb/BreadcrumbItem.java index d06c5c2e..e3b682ee 100644 --- a/src/main/java/org/woehlke/simpleworklist/breadcrumb/BreadcrumbItem.java +++ b/src/main/java/org/woehlke/simpleworklist/application/breadcrumb/BreadcrumbItem.java @@ -1,10 +1,9 @@ -package org.woehlke.simpleworklist.breadcrumb; +package org.woehlke.simpleworklist.application.breadcrumb; import lombok.*; import javax.validation.constraints.NotNull; import java.io.Serializable; -import java.util.Objects; @Getter @Setter diff --git a/src/main/java/org/woehlke/simpleworklist/breadcrumb/BreadcrumbService.java b/src/main/java/org/woehlke/simpleworklist/application/breadcrumb/BreadcrumbService.java similarity index 96% rename from src/main/java/org/woehlke/simpleworklist/breadcrumb/BreadcrumbService.java rename to src/main/java/org/woehlke/simpleworklist/application/breadcrumb/BreadcrumbService.java index c9454993..18a9fb4b 100644 --- a/src/main/java/org/woehlke/simpleworklist/breadcrumb/BreadcrumbService.java +++ b/src/main/java/org/woehlke/simpleworklist/application/breadcrumb/BreadcrumbService.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.breadcrumb; +package org.woehlke.simpleworklist.application.breadcrumb; import org.woehlke.simpleworklist.context.Context; import org.woehlke.simpleworklist.project.Project; diff --git a/src/main/java/org/woehlke/simpleworklist/breadcrumb/BreadcrumbServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/application/breadcrumb/BreadcrumbServiceImpl.java similarity index 99% rename from src/main/java/org/woehlke/simpleworklist/breadcrumb/BreadcrumbServiceImpl.java rename to src/main/java/org/woehlke/simpleworklist/application/breadcrumb/BreadcrumbServiceImpl.java index d44b891d..59edd837 100644 --- a/src/main/java/org/woehlke/simpleworklist/breadcrumb/BreadcrumbServiceImpl.java +++ b/src/main/java/org/woehlke/simpleworklist/application/breadcrumb/BreadcrumbServiceImpl.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.breadcrumb; +package org.woehlke.simpleworklist.application.breadcrumb; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/woehlke/simpleworklist/application/breadcrumb/BreadcrumbServiceTest.java b/src/main/java/org/woehlke/simpleworklist/application/breadcrumb/BreadcrumbServiceTest.java new file mode 100644 index 00000000..e2911460 --- /dev/null +++ b/src/main/java/org/woehlke/simpleworklist/application/breadcrumb/BreadcrumbServiceTest.java @@ -0,0 +1,4 @@ +package org.woehlke.simpleworklist.application.breadcrumb; + +public class BreadcrumbServiceTest { +} diff --git a/src/main/java/org/woehlke/simpleworklist/common/AbstractController.java b/src/main/java/org/woehlke/simpleworklist/application/common/AbstractController.java similarity index 93% rename from src/main/java/org/woehlke/simpleworklist/common/AbstractController.java rename to src/main/java/org/woehlke/simpleworklist/application/common/AbstractController.java index 80db91ec..d92da238 100644 --- a/src/main/java/org/woehlke/simpleworklist/common/AbstractController.java +++ b/src/main/java/org/woehlke/simpleworklist/application/common/AbstractController.java @@ -1,11 +1,11 @@ -package org.woehlke.simpleworklist.common; +package org.woehlke.simpleworklist.application.common; import org.springframework.ui.Model; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.SessionAttributes; -import org.woehlke.simpleworklist.breadcrumb.BreadcrumbService; -import org.woehlke.simpleworklist.config.ApplicationProperties; +import org.woehlke.simpleworklist.application.breadcrumb.BreadcrumbService; +import org.woehlke.simpleworklist.application.ApplicationProperties; import org.woehlke.simpleworklist.context.Context; import org.woehlke.simpleworklist.project.Project; import org.woehlke.simpleworklist.task.TaskService; @@ -15,9 +15,9 @@ import org.woehlke.simpleworklist.task.TaskTime; import org.woehlke.simpleworklist.context.ContextService; import org.woehlke.simpleworklist.project.ProjectService; -import org.woehlke.simpleworklist.user.messages.User2UserMessageService; +import org.woehlke.simpleworklist.user.chat.User2UserMessageService; import org.woehlke.simpleworklist.user.account.UserAccountService; -import org.woehlke.simpleworklist.session.UserSessionBean; +import org.woehlke.simpleworklist.user.session.UserSessionBean; import org.springframework.beans.factory.annotation.Autowired; import org.woehlke.simpleworklist.user.account.UserAccountAccessService; diff --git a/src/main/java/org/woehlke/simpleworklist/common/AuditModel.java b/src/main/java/org/woehlke/simpleworklist/application/common/AuditModel.java similarity index 96% rename from src/main/java/org/woehlke/simpleworklist/common/AuditModel.java rename to src/main/java/org/woehlke/simpleworklist/application/common/AuditModel.java index 2b1800de..9a5553a9 100644 --- a/src/main/java/org/woehlke/simpleworklist/common/AuditModel.java +++ b/src/main/java/org/woehlke/simpleworklist/application/common/AuditModel.java @@ -1,7 +1,6 @@ -package org.woehlke.simpleworklist.common; +package org.woehlke.simpleworklist.application.common; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import org.hibernate.id.UUIDGenerator; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; diff --git a/src/main/java/org/woehlke/simpleworklist/common/ComparableById.java b/src/main/java/org/woehlke/simpleworklist/application/common/ComparableById.java similarity index 77% rename from src/main/java/org/woehlke/simpleworklist/common/ComparableById.java rename to src/main/java/org/woehlke/simpleworklist/application/common/ComparableById.java index af6a9108..10cfad26 100644 --- a/src/main/java/org/woehlke/simpleworklist/common/ComparableById.java +++ b/src/main/java/org/woehlke/simpleworklist/application/common/ComparableById.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.common; +package org.woehlke.simpleworklist.application.common; public interface ComparableById { boolean equalsById(T otherObject); diff --git a/src/main/java/org/woehlke/simpleworklist/config/di/WebMvcConfig.java b/src/main/java/org/woehlke/simpleworklist/application/config/WebMvcConfig.java similarity index 97% rename from src/main/java/org/woehlke/simpleworklist/config/di/WebMvcConfig.java rename to src/main/java/org/woehlke/simpleworklist/application/config/WebMvcConfig.java index c91475bd..a9b128b1 100644 --- a/src/main/java/org/woehlke/simpleworklist/config/di/WebMvcConfig.java +++ b/src/main/java/org/woehlke/simpleworklist/application/config/WebMvcConfig.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.config.di; +package org.woehlke.simpleworklist.application.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -18,7 +18,7 @@ import org.springframework.web.servlet.i18n.LocaleChangeInterceptor; import org.springframework.web.servlet.i18n.SessionLocaleResolver; import org.thymeleaf.dialect.springdata.SpringDataDialect; -import org.woehlke.simpleworklist.config.ApplicationProperties; +import org.woehlke.simpleworklist.application.ApplicationProperties; import java.util.Locale; import java.util.Properties; diff --git a/src/main/java/org/woehlke/simpleworklist/config/di/WebSecurityConfig.java b/src/main/java/org/woehlke/simpleworklist/application/config/WebSecurityConfig.java similarity index 96% rename from src/main/java/org/woehlke/simpleworklist/config/di/WebSecurityConfig.java rename to src/main/java/org/woehlke/simpleworklist/application/config/WebSecurityConfig.java index 1f435cb9..e4bba3e2 100644 --- a/src/main/java/org/woehlke/simpleworklist/config/di/WebSecurityConfig.java +++ b/src/main/java/org/woehlke/simpleworklist/application/config/WebSecurityConfig.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.config.di; +package org.woehlke.simpleworklist.application.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; @@ -19,7 +19,8 @@ import org.springframework.security.web.authentication.AuthenticationSuccessHandler; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.woehlke.simpleworklist.config.ApplicationProperties; +import org.woehlke.simpleworklist.application.ApplicationProperties; +import org.woehlke.simpleworklist.application.config.WebMvcConfig; import org.woehlke.simpleworklist.user.login.LoginSuccessHandler; import org.woehlke.simpleworklist.user.account.UserAccountSecurityService; diff --git a/src/main/java/org/woehlke/simpleworklist/error/MyErrorController.java b/src/main/java/org/woehlke/simpleworklist/application/error/MyErrorController.java similarity index 94% rename from src/main/java/org/woehlke/simpleworklist/error/MyErrorController.java rename to src/main/java/org/woehlke/simpleworklist/application/error/MyErrorController.java index 4e32762e..82d7f3cc 100644 --- a/src/main/java/org/woehlke/simpleworklist/error/MyErrorController.java +++ b/src/main/java/org/woehlke/simpleworklist/application/error/MyErrorController.java @@ -1,10 +1,7 @@ -package org.woehlke.simpleworklist.error; +package org.woehlke.simpleworklist.application.error; import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.autoconfigure.web.servlet.error.AbstractErrorController; -import org.springframework.boot.autoconfigure.web.servlet.error.ErrorViewResolver; -import org.springframework.boot.web.servlet.error.ErrorAttributes; import org.springframework.boot.web.servlet.error.ErrorController; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Controller; diff --git a/src/main/java/org/woehlke/simpleworklist/application/error/MyErrorControllerTest.java b/src/main/java/org/woehlke/simpleworklist/application/error/MyErrorControllerTest.java new file mode 100644 index 00000000..5df6a75d --- /dev/null +++ b/src/main/java/org/woehlke/simpleworklist/application/error/MyErrorControllerTest.java @@ -0,0 +1,4 @@ +package org.woehlke.simpleworklist.application.error; + +public class MyErrorControllerTest { +} diff --git a/src/main/java/org/woehlke/simpleworklist/language/Language.java b/src/main/java/org/woehlke/simpleworklist/application/language/Language.java similarity index 92% rename from src/main/java/org/woehlke/simpleworklist/language/Language.java rename to src/main/java/org/woehlke/simpleworklist/application/language/Language.java index 990edd62..6896a0dd 100644 --- a/src/main/java/org/woehlke/simpleworklist/language/Language.java +++ b/src/main/java/org/woehlke/simpleworklist/application/language/Language.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.language; +package org.woehlke.simpleworklist.application.language; import javax.persistence.Enumerated; import java.io.Serializable; diff --git a/src/main/java/org/woehlke/simpleworklist/language/UserChangeLanguageForm.java b/src/main/java/org/woehlke/simpleworklist/application/language/UserChangeLanguageForm.java similarity index 87% rename from src/main/java/org/woehlke/simpleworklist/language/UserChangeLanguageForm.java rename to src/main/java/org/woehlke/simpleworklist/application/language/UserChangeLanguageForm.java index aaaa82ed..278455c6 100644 --- a/src/main/java/org/woehlke/simpleworklist/language/UserChangeLanguageForm.java +++ b/src/main/java/org/woehlke/simpleworklist/application/language/UserChangeLanguageForm.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.language; +package org.woehlke.simpleworklist.application.language; import lombok.*; diff --git a/src/main/java/org/woehlke/simpleworklist/config/listener/ContextRefreshedListener.java b/src/main/java/org/woehlke/simpleworklist/application/listener/ContextRefreshedListener.java similarity index 95% rename from src/main/java/org/woehlke/simpleworklist/config/listener/ContextRefreshedListener.java rename to src/main/java/org/woehlke/simpleworklist/application/listener/ContextRefreshedListener.java index 2c789dd6..d0489db4 100644 --- a/src/main/java/org/woehlke/simpleworklist/config/listener/ContextRefreshedListener.java +++ b/src/main/java/org/woehlke/simpleworklist/application/listener/ContextRefreshedListener.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.config.listener; +package org.woehlke.simpleworklist.application.listener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/woehlke/simpleworklist/config/listener/ContextStartedListener.java b/src/main/java/org/woehlke/simpleworklist/application/listener/ContextStartedListener.java similarity index 95% rename from src/main/java/org/woehlke/simpleworklist/config/listener/ContextStartedListener.java rename to src/main/java/org/woehlke/simpleworklist/application/listener/ContextStartedListener.java index 090b1756..ab6743a6 100644 --- a/src/main/java/org/woehlke/simpleworklist/config/listener/ContextStartedListener.java +++ b/src/main/java/org/woehlke/simpleworklist/application/listener/ContextStartedListener.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.config.listener; +package org.woehlke.simpleworklist.application.listener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/woehlke/simpleworklist/testdata/TestDataController.java b/src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataController.java similarity index 93% rename from src/main/java/org/woehlke/simpleworklist/testdata/TestDataController.java rename to src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataController.java index e02d736e..b9feebc3 100644 --- a/src/main/java/org/woehlke/simpleworklist/testdata/TestDataController.java +++ b/src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataController.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.testdata; +package org.woehlke.simpleworklist.application.testdata; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; @@ -30,7 +30,7 @@ public TestDataController( public String createTestCategoryTree() { UserAccount user = userAccountLoginSuccessService.retrieveCurrentUser(); testDataService.createTestCategoryTreeForUserAccount(user); - return "redirect:/"; + return "redirect:/home"; } } diff --git a/src/main/java/org/woehlke/simpleworklist/testdata/TestDataService.java b/src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataService.java similarity index 75% rename from src/main/java/org/woehlke/simpleworklist/testdata/TestDataService.java rename to src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataService.java index 8862e2e6..dad58486 100644 --- a/src/main/java/org/woehlke/simpleworklist/testdata/TestDataService.java +++ b/src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataService.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.testdata; +package org.woehlke.simpleworklist.application.testdata; import org.woehlke.simpleworklist.user.account.UserAccount; diff --git a/src/main/java/org/woehlke/simpleworklist/testdata/TestDataServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataServiceImpl.java similarity index 93% rename from src/main/java/org/woehlke/simpleworklist/testdata/TestDataServiceImpl.java rename to src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataServiceImpl.java index 6a30653a..5bb9ec35 100644 --- a/src/main/java/org/woehlke/simpleworklist/testdata/TestDataServiceImpl.java +++ b/src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataServiceImpl.java @@ -1,7 +1,6 @@ -package org.woehlke.simpleworklist.testdata; +package org.woehlke.simpleworklist.application.testdata; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -20,17 +19,14 @@ import java.util.Date; import java.util.Iterator; import java.util.List; +import java.util.UUID; - +@Slf4j @Service public class TestDataServiceImpl implements TestDataService { - private static final Logger LOGGER = LoggerFactory.getLogger(TestDataServiceImpl.class); - private final ProjectRepository projectRepository; - private final TaskRepository taskRepository; - private final ContextRepository contextRepository; @Autowired @@ -45,9 +41,9 @@ public void createTestCategoryTreeForUserAccount(UserAccount userAccount) { List contexts = contextRepository.findByUserAccount(userAccount); Iterator iterator = contexts.iterator(); Context contextWork = iterator.next(); - LOGGER.info("----------------------------------------------"); - LOGGER.info("createTestCategoryTreeForUserAccount"); - LOGGER.info("----------------------------------------------"); + log.info("----------------------------------------------"); + log.info("createTestCategoryTreeForUserAccount"); + log.info("----------------------------------------------"); Date nowDate = new Date(); long now = nowDate.getTime(); String name01 = "test01_" + now; @@ -62,18 +58,28 @@ public void createTestCategoryTreeForUserAccount(UserAccount userAccount) { String name02020301 = "test02020301_" + now; String name02020302 = "test02020302_" + now; String name02020303 = "test02020303_" + now; - Project c01 = Project.newRootProjectFactory(userAccount, contextWork); - Project c02 = Project.newRootProjectFactory(userAccount, contextWork); + Project c01 = Project.newRootProjectFactory(contextWork); + Project c02 = Project.newRootProjectFactory(contextWork); + c01.setUuid(UUID.randomUUID().toString()); + c02.setUuid(UUID.randomUUID().toString()); c01.setName(name01); c02.setName(name02); - c01.setDescription("description01 for " + name01 + loremIpsumProject); - c02.setDescription("description02 for " + name02 + loremIpsumProject); + c01.setDescription("description01 for " + name01 + " " + loremIpsumProject); + c02.setDescription("description02 for " + name02 + " " + loremIpsumProject); c01 = projectRepository.saveAndFlush(c01); c02 = projectRepository.saveAndFlush(c02); - Project c0101 = Project.newProjectFactory(c01); - Project c0102 = Project.newProjectFactory(c01); - Project c0201 = Project.newProjectFactory(c02); - Project c0202 = Project.newProjectFactory(c02); + log.info("----------------------------------------------"); + log.info("persisted: "+ c01.toString()); + log.info("persisted: "+ c02.toString()); + log.info("----------------------------------------------"); + Project c0101 = Project.newProjectFactoryForParentProject(c01); + Project c0102 = Project.newProjectFactoryForParentProject(c01); + Project c0201 = Project.newProjectFactoryForParentProject(c02); + Project c0202 = Project.newProjectFactoryForParentProject(c02); + c0101.setUuid(UUID.randomUUID().toString()); + c0102.setUuid(UUID.randomUUID().toString()); + c0201.setUuid(UUID.randomUUID().toString()); + c0202.setUuid(UUID.randomUUID().toString()); c0101.setName(name0101); c0102.setName(name0102); c0201.setName(name0201); @@ -82,32 +88,50 @@ public void createTestCategoryTreeForUserAccount(UserAccount userAccount) { c01.getChildren().add(c0102); c02.getChildren().add(c0201); c02.getChildren().add(c0202); - c0101.setDescription("description0101 for " + name0101 + loremIpsumProject); - c0102.setDescription("description0102 for " + name0102 + loremIpsumProject); - c0201.setDescription("description0201 for " + name0201 + loremIpsumProject); - c0202.setDescription("description0202 for " + name0202 + loremIpsumProject); + c0101.setDescription("description0101 for " + name0101 + " " + loremIpsumProject); + c0102.setDescription("description0102 for " + name0102 + " " + loremIpsumProject); + c0201.setDescription("description0201 for " + name0201 + " " + loremIpsumProject); + c0202.setDescription("description0202 for " + name0202 + " " + loremIpsumProject); c0101 = projectRepository.saveAndFlush(c0101); c0102 = projectRepository.saveAndFlush(c0102); c0201 = projectRepository.saveAndFlush(c0201); c0202 = projectRepository.saveAndFlush(c0202); - Project c020201 = Project.newProjectFactory(c0202); - Project c020202 = Project.newProjectFactory(c0202); - Project c020203 = Project.newProjectFactory(c0202); + log.info("----------------------------------------------"); + log.info("persisted: "+ c0101.toString()); + log.info("persisted: "+ c0102.toString()); + log.info("persisted: "+ c0201.toString()); + log.info("persisted: "+ c0202.toString()); + log.info("----------------------------------------------"); + Project c020201 = Project.newProjectFactoryForParentProject(c0202); + Project c020202 = Project.newProjectFactoryForParentProject(c0202); + Project c020203 = Project.newProjectFactoryForParentProject(c0202); + c020201.setUuid(UUID.randomUUID().toString()); + c020202.setUuid(UUID.randomUUID().toString()); + c020203.setUuid(UUID.randomUUID().toString()); c020201.setName(name020201); c020202.setName(name020202); c020203.setName(name020203); c0202.getChildren().add(c020201); c0202.getChildren().add(c020202); c0202.getChildren().add(c020203); - c020201.setDescription("description for " + name020201); - c020202.setDescription("description for " + name020202); - c020203.setDescription("description for " + name020203); + c020201.setDescription("description for " + name020201 + " " + loremIpsumProject); + c020202.setDescription("description for " + name020202 + " " + loremIpsumProject); + c020203.setDescription("description for " + name020203 + " " + loremIpsumProject); c020201 = projectRepository.saveAndFlush(c020201); c020202 = projectRepository.saveAndFlush(c020202); c020203 = projectRepository.saveAndFlush(c020203); - Project c02020301 = Project.newProjectFactory(c020203); - Project c02020302 = Project.newProjectFactory(c020203); - Project c02020303 = Project.newProjectFactory(c020203); + log.info("----------------------------------------------"); + log.info("persisted: "+ c020201.toString()); + log.info("persisted: "+ c020202.toString()); + log.info("persisted: "+ c020202.toString()); + log.info("persisted: "+ c020203.toString()); + log.info("----------------------------------------------"); + Project c02020301 = Project.newProjectFactoryForParentProject(c020203); + Project c02020302 = Project.newProjectFactoryForParentProject(c020203); + Project c02020303 = Project.newProjectFactoryForParentProject(c020203); + c02020301.setUuid(UUID.randomUUID().toString()); + c02020302.setUuid(UUID.randomUUID().toString()); + c02020303.setUuid(UUID.randomUUID().toString()); c02020301.setName(name02020301); c02020302.setName(name02020302); c02020303.setName(name02020303); @@ -120,37 +144,53 @@ public void createTestCategoryTreeForUserAccount(UserAccount userAccount) { c02020301 = projectRepository.saveAndFlush(c02020301); c02020302 = projectRepository.saveAndFlush(c02020302); c02020303 = projectRepository.saveAndFlush(c02020303); + log.info("----------------------------------------------"); + log.info("persisted: "+ c02020301.toString()); + log.info("persisted: "+ c02020302.toString()); + log.info("persisted: "+ c02020303.toString()); + log.info("----------------------------------------------"); + /* add 100 Tasks with Project c02020303 */ for (int i = 10; i < 111; i++) { - String title = "t_" + i; - String text = "d_" + i + loremIpsumTask; - Task d = new Task(); - d.setText(text); - d.setTitle(title); - d.setProject(c02020303); - d.setTaskState(TaskState.INBOX); - d.setFocus(false); - d.setTaskEnergy(TaskEnergy.NONE); - d.setTaskTime(TaskTime.NONE); - d.setContext(contextWork); - d.setOrderIdProject(i); - d.setOrderIdTaskState(i); - taskRepository.saveAndFlush(d); + String title = "title_" + i; + String text = "desc_" + i + " "+ loremIpsumTask; + Task task = new Task(); + task.setUuid(UUID.randomUUID().toString()); + task.setText(text); + task.setTitle(title); + task.setProject(c02020303); + task.setTaskState(TaskState.INBOX); + task.setFocus(false); + task.setTaskEnergy(TaskEnergy.NONE); + task.setTaskTime(TaskTime.NONE); + task.setContext(contextWork); + task.setOrderIdProject(i); + task.setOrderIdTaskState(i); + taskRepository.saveAndFlush(task); + log.info("----------------------------------------------"); + log.info("persisted: "+ task.toString()); + log.info("----------------------------------------------"); } - /* without Project for Main INBOX */ + log.info("----------------------------------------------"); + /* add 20 Tasks with Project Root */ for (int i = 10; i <30; i++) { String title = "title_" + i; - String text = "desc_" + i; - Task d = new Task(); - d.setText(text); - d.setTitle(title); - d.setTaskState(TaskState.INBOX); - d.setFocus(false); - d.setTaskEnergy(TaskEnergy.NONE); - d.setTaskTime(TaskTime.NONE); - d.setContext(contextWork); - d.setOrderIdProject(i); - d.setOrderIdTaskState(i+111); - taskRepository.saveAndFlush(d); + String text = "desc_" + i + " "+ loremIpsumTask; + Task task = new Task(); + task.setUuid(UUID.randomUUID().toString()); + task.setText(text); + task.setTitle(title); + task.setProject(null); + task.setTaskState(TaskState.INBOX); + task.setFocus(false); + task.setTaskEnergy(TaskEnergy.NONE); + task.setTaskTime(TaskTime.NONE); + task.setContext(contextWork); + task.setOrderIdProject(i); + task.setOrderIdTaskState(i+111); + taskRepository.saveAndFlush(task); + log.info("----------------------------------------------"); + log.info("persisted: "+ task.toString()); + log.info("----------------------------------------------"); } } @@ -335,6 +375,8 @@ public void createTestCategoryTreeForUserAccount(UserAccount userAccount) { "At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat. \n" + "\n" + "Consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus"; + + private final String loremIpsumProject = " Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. \n" + "\n" + "Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. \n" + diff --git a/src/main/java/org/woehlke/simpleworklist/context/Context.java b/src/main/java/org/woehlke/simpleworklist/context/Context.java index 910e9f8a..a2921a90 100644 --- a/src/main/java/org/woehlke/simpleworklist/context/Context.java +++ b/src/main/java/org/woehlke/simpleworklist/context/Context.java @@ -4,17 +4,14 @@ import org.hibernate.annotations.LazyToOne; import org.hibernate.validator.constraints.Length; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import org.hibernate.validator.constraints.SafeHtml; -import org.woehlke.simpleworklist.common.AuditModel; -import org.woehlke.simpleworklist.common.ComparableById; +//import org.hibernate.validator.constraints.SafeHtml; +import org.woehlke.simpleworklist.application.common.AuditModel; +import org.woehlke.simpleworklist.application.common.ComparableById; import org.woehlke.simpleworklist.user.account.UserAccount; import javax.persistence.*; import javax.persistence.Index; import java.io.Serializable; -import java.util.Objects; import static org.hibernate.annotations.LazyToOneOption.PROXY; @@ -64,13 +61,13 @@ public class Context extends AuditModel implements Serializable, ComparableById< @LazyToOne(PROXY) private UserAccount userAccount; - @SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE) + //@SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE) //@NotBlank @Length(min = 1, max = 255) @Column(name = "name_de", nullable = false) private String nameDe; - @SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE) + //@SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE) //@NotBlank @Length(min = 1, max = 255) @Column(name = "name_en", nullable = false) diff --git a/src/main/java/org/woehlke/simpleworklist/context/ContextController.java b/src/main/java/org/woehlke/simpleworklist/context/ContextController.java index d0a7cf2b..4a89adb3 100644 --- a/src/main/java/org/woehlke/simpleworklist/context/ContextController.java +++ b/src/main/java/org/woehlke/simpleworklist/context/ContextController.java @@ -7,8 +7,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.woehlke.simpleworklist.common.AbstractController; -import org.woehlke.simpleworklist.session.UserSessionBean; +import org.woehlke.simpleworklist.application.common.AbstractController; +import org.woehlke.simpleworklist.user.session.UserSessionBean; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/woehlke/simpleworklist/context/NewContextForm.java b/src/main/java/org/woehlke/simpleworklist/context/NewContextForm.java index c92d81cd..66966512 100644 --- a/src/main/java/org/woehlke/simpleworklist/context/NewContextForm.java +++ b/src/main/java/org/woehlke/simpleworklist/context/NewContextForm.java @@ -3,7 +3,7 @@ import lombok.*; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; -import org.hibernate.validator.constraints.SafeHtml; +//import org.hibernate.validator.constraints.SafeHtml; import java.io.Serializable; @@ -20,12 +20,12 @@ public class NewContextForm implements Serializable { private static final long serialVersionUID = -937143305653156981L; - @SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE) + //@SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE) @NotBlank @Length(min = 1, max = 255) private String nameDe; - @SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE) + //@SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE) @NotBlank @Length(min = 1, max = 255) private String nameEn; diff --git a/src/main/java/org/woehlke/simpleworklist/project/Project.java b/src/main/java/org/woehlke/simpleworklist/project/Project.java index 4081de74..f690c2b5 100644 --- a/src/main/java/org/woehlke/simpleworklist/project/Project.java +++ b/src/main/java/org/woehlke/simpleworklist/project/Project.java @@ -15,10 +15,10 @@ import org.hibernate.annotations.OnDeleteAction; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; -import org.hibernate.validator.constraints.SafeHtml; +//import org.hibernate.validator.constraints.SafeHtml; import org.woehlke.simpleworklist.context.Context; -import org.woehlke.simpleworklist.common.AuditModel; -import org.woehlke.simpleworklist.common.ComparableById; +import org.woehlke.simpleworklist.application.common.AuditModel; +import org.woehlke.simpleworklist.application.common.ComparableById; import org.woehlke.simpleworklist.user.account.UserAccount; @Entity @@ -76,7 +76,7 @@ public class Project extends AuditModel implements Serializable, ComparableById< @OnDelete(action = OnDeleteAction.NO_ACTION) private Context context; - @SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE) + //@SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE) @NotBlank @Length(min = 1, max = 255) @Column(name = "name", nullable = false) @@ -140,24 +140,19 @@ public boolean equalsByUuid(Project otherObject) { return super.equalsByMyUuid(otherObject); } - public static Project newProjectFactory(Project parent) { - Project n = new Project(); - n.setParent(parent); - n.setContext(parent.getContext()); - return n; - } - - public static Project newRootProjectFactory(UserAccount userAccount) { - Project n = new Project(); - n.setParent(null); - return n; + public static Project newProjectFactoryForParentProject(Project parent) { + Project thisProject = new Project(); + //thisProject.setName("name"); + thisProject.setParent(parent); + thisProject.setContext(parent.getContext()); + return thisProject; } public static Project newRootProjectFactory(Context context) { - Project n = new Project(); - n.setParent(null); - n.setContext(context); - return n; + Project thisProject = new Project(); + thisProject.setParent(null); + thisProject.setContext(context); + return thisProject; } @@ -167,5 +162,10 @@ public static Project newRootProjectFactory(UserAccount userAccount, Context con return newRootProjectFactory(context); } + public Project addOtherProjectToChildren(Project project) { + children.add(project); + project.setParent(this); + return project; + } } diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java index 510b393d..b8ec6e47 100644 --- a/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java +++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java @@ -8,20 +8,23 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.validation.BindingResult; +import org.springframework.validation.FieldError; import org.springframework.validation.ObjectError; import org.springframework.web.bind.annotation.*; -import org.woehlke.simpleworklist.common.AbstractController; +import org.woehlke.simpleworklist.application.common.AbstractController; import org.woehlke.simpleworklist.context.Context; import org.woehlke.simpleworklist.task.*; import org.woehlke.simpleworklist.user.account.UserAccount; -import org.woehlke.simpleworklist.breadcrumb.Breadcrumb; -import org.woehlke.simpleworklist.session.UserSessionBean; +import org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb; +import org.woehlke.simpleworklist.user.session.UserSessionBean; import org.springframework.beans.factory.annotation.Autowired; import javax.validation.Valid; import java.util.List; import java.util.Locale; +import static org.woehlke.simpleworklist.project.Project.rootProjectId; + /** * Created by tw on 14.02.16. */ @@ -32,11 +35,13 @@ public class ProjectController extends AbstractController { private final ProjectControllerService projectControllerService; private final TaskService taskService; + private final TaskStateControllerService taskStateControllerService; @Autowired - public ProjectController(ProjectControllerService projectControllerService, TaskService taskService) { + public ProjectController(ProjectControllerService projectControllerService, TaskService taskService, TaskStateControllerService taskStateControllerService) { this.projectControllerService = projectControllerService; this.taskService = taskService; + this.taskStateControllerService = taskStateControllerService; } @RequestMapping(path = "/task/add", method = RequestMethod.GET) @@ -51,6 +56,7 @@ public final String projectTaskAddGet( task.setTaskEnergy(TaskEnergy.NONE); task.setTaskTime(TaskTime.NONE); task.setProject(thisProject); + task.unsetFocus(); Boolean mustChooseArea = false; if(userSession.getLastContextId() == 0L){ mustChooseArea = true; @@ -154,7 +160,7 @@ public final String projectAddProjectGet( ) { log.info("private addNewProjectGet (GET) projectId="+projectId); Context context = super.getContext(userSession); - projectControllerService.addNewProject(projectId, userSession, context, locale, model); + projectControllerService.addNewProjectToProjectIdForm(projectId, userSession, context, locale, model); return "project/id/project/add"; } @@ -167,15 +173,14 @@ public final String projectAddProjectPost( Locale locale, Model model) { log.info("private addNewProjectPost (POST) projectId="+projectId+" "+project.toString()); Context context = super.getContext(userSession); - return projectControllerService.addNewProjectPersist( + return projectControllerService.addNewProjectToProjectIdPersist( projectId, userSession, project, context, result, locale, - model , - "project/id/project/add" + model ); } @@ -207,7 +212,7 @@ public final String projectEditGet( model.addAttribute("userSession",userSession); List contexts = contextService.getAllForUser(userAccount); Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShowOneProject(thisProject,locale); - model.addAttribute("areas", contexts); + model.addAttribute("contexts", contexts); model.addAttribute("breadcrumb", breadcrumb); model.addAttribute("thisProject", thisProject); model.addAttribute("project", thisProject); @@ -351,6 +356,81 @@ public final String emptyTrash( } + @RequestMapping(path = "/task/{taskId}/edit", method = RequestMethod.GET) + public final String editTaskGet( + @PathVariable("projectId") Project thisProject, + @PathVariable("taskId") Task task, + @ModelAttribute("userSession") UserSessionBean userSession, + Locale locale, Model model + ) { + log.info("editTaskGet"); + UserAccount userAccount = userAccountLoginSuccessService.retrieveCurrentUser(); + List contexts = contextService.getAllForUser(userAccount); + Context thisContext = task.getContext(); + Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShowOneProject(thisProject,locale); + model.addAttribute("breadcrumb", breadcrumb); + model.addAttribute("thisProject", thisProject); + model.addAttribute("thisContext", thisContext); + model.addAttribute("task", task); + model.addAttribute("contexts", contexts); + return "project/id/task/edit"; + } + + @RequestMapping(path = "/task/{taskId}/edit", method = RequestMethod.POST) + public final String editTaskPost( + @PathVariable("projectId") Project thisProject, + @PathVariable long taskId, + @Valid Task task, + @ModelAttribute("userSession") UserSessionBean userSession, + BindingResult result, + Locale locale, + Model model + ) { + log.info("editTaskPost"); + if(task.getTaskState()==TaskState.SCHEDULED && task.getDueDate()==null){ + String objectName="task"; + String field="dueDate"; + String defaultMessage="you need a due Date to schedule the Task"; + FieldError error = new FieldError(objectName,field,defaultMessage); + result.addError(error); + field="taskState"; + error = new FieldError(objectName,field,defaultMessage); + result.addError(error); + } + if (result.hasErrors() ) { + log.warn("result.hasErrors"); + for (ObjectError e : result.getAllErrors()) { + log.error(e.toString()); + } + UserAccount userAccount = userAccountLoginSuccessService.retrieveCurrentUser(); + List contexts = contextService.getAllForUser(userAccount); + Task persistentTask = taskService.findOne(taskId); + persistentTask.merge(task); + task = persistentTask; + Context thisContext = task.getContext(); + Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShowOneProject(thisProject,locale); + model.addAttribute("breadcrumb", breadcrumb); + model.addAttribute("thisProject", thisProject); + model.addAttribute("thisContext", thisContext); + model.addAttribute("task", task); + model.addAttribute("contexts", contexts); + userSession.setLastProjectId(thisProject.getId()); + userSession.setLastTaskState(task.getTaskState()); + userSession.setLastTaskId(task.getId()); + userSession.setLastContextId(thisContext.getId()); + return "project/id/task/edit"; + } else { + task.setProject(thisProject); + Task persistentTask = taskService.findOne(task.getId()); + persistentTask.merge(task); + task = taskService.updatedViaProject(persistentTask); + userSession.setLastProjectId(rootProjectId); + userSession.setLastTaskState(task.getTaskState()); + userSession.setLastTaskId(task.getId()); + return thisProject.getUrl(); + } + } + @RequestMapping(path = "/task/{taskId}/complete", method = RequestMethod.GET) public final String setDoneTaskGet( @PathVariable("projectId") Project thisProject, @@ -386,13 +466,9 @@ public final String setFocusGet( @PathVariable("taskId") Task task, @RequestParam(required=false) String back ){ - if(task !=null) { - task.setFocus(); - task = taskService.updatedViaTaskstate(task); - return task.getUrl(); - } else { - return "redirect:/taskstate/inbox"; - } + task.setFocus(); + task = taskService.updatedViaTaskstate(task); + return thisProject.getUrl(); } @RequestMapping(path = "/task/{taskId}/unsetfocus", method = RequestMethod.GET) @@ -402,13 +478,9 @@ public final String unsetFocusGet( @PathVariable("taskId") Task task, @RequestParam(required=false) String back ){ - if(task !=null) { - task.unsetFocus(); - task = taskService.updatedViaTaskstate(task); - return task.getUrl(); - } else { - return "redirect:/taskstate/inbox"; - } + task.unsetFocus(); + task = taskService.updatedViaTaskstate(task); + return thisProject.getUrl(); } @RequestMapping(path = "/task/{taskId}/move/to/project/root", method = RequestMethod.GET) @@ -531,4 +603,16 @@ public final String moveTaskToTrash( return thisProject.getUrl(); } + @RequestMapping(path = "/task/{taskId}/transform", method = RequestMethod.GET) + public final String transformTaskIntoProjectGet( + @PathVariable("projectId") Project thisProject, + @PathVariable("taskId") Task task, + @ModelAttribute("userSession") UserSessionBean userSession + ) { + log.info("transformTaskIntoProjectGet"); + userSession.setLastProjectId(thisProject.getId()); + userSession.setLastTaskState(task.getTaskState()); + userSession.setLastTaskId(task.getId()); + return taskStateControllerService.transformTaskIntoProjectGet(task); + } } diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java index 6b34f8b7..b1c1b42a 100644 --- a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java +++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java @@ -9,13 +9,14 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.validation.BindingResult; +import org.springframework.validation.FieldError; import org.springframework.validation.ObjectError; import org.springframework.web.bind.annotation.*; -import org.woehlke.simpleworklist.breadcrumb.Breadcrumb; -import org.woehlke.simpleworklist.common.AbstractController; +import org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb; +import org.woehlke.simpleworklist.application.common.AbstractController; import org.woehlke.simpleworklist.context.Context; import org.woehlke.simpleworklist.task.*; -import org.woehlke.simpleworklist.session.UserSessionBean; +import org.woehlke.simpleworklist.user.session.UserSessionBean; import org.woehlke.simpleworklist.user.account.UserAccount; import javax.validation.Valid; @@ -34,11 +35,13 @@ public class ProjectControllerRoot extends AbstractController { private final ProjectControllerService projectControllerService; private final TaskService taskService; + private final TaskStateControllerService taskStateControllerService; @Autowired - public ProjectControllerRoot(ProjectControllerService projectControllerService, TaskService taskService) { + public ProjectControllerRoot(ProjectControllerService projectControllerService, TaskService taskService, TaskStateControllerService taskStateControllerService) { this.projectControllerService = projectControllerService; this.taskService = taskService; + this.taskStateControllerService = taskStateControllerService; } @RequestMapping(path="", method = RequestMethod.GET) @@ -72,7 +75,7 @@ public final String projectRootAddProjectGet( ){ log.info("/project/root/project/add (GET)"); Context context = super.getContext(userSession); - projectControllerService.addNewProjectToRoot(userSession, context, locale, model); + projectControllerService.addNewProjectToProjectRootForm(userSession, context, locale, model); return "project/root/project/add"; } @@ -89,7 +92,7 @@ public final String projectRootAddProjectPost( return "project/root/project/add"; } else { project.setUuid(UUID.randomUUID().toString()); - return projectControllerService.addNewProjectToRootPersist( + return projectControllerService.addNewProjectToProjectRootPersist( userSession, project, context, @@ -200,7 +203,7 @@ public final String editTaskGet( model.addAttribute("thisProject", thisProject); //TODO: remove? model.addAttribute("thisContext", thisContext); model.addAttribute("task", task); - model.addAttribute("areas", contexts); + model.addAttribute("contexts", contexts); return "project/root/task/edit"; } @@ -214,6 +217,18 @@ public final String editTaskPost( Model model ) { log.info("editTaskPost"); + + log.info("editTaskPost"); + if(task.getTaskState()==TaskState.SCHEDULED && task.getDueDate()==null){ + String objectName="task"; + String field="dueDate"; + String defaultMessage="you need a due Date to schedule the Task"; + FieldError error = new FieldError(objectName,field,defaultMessage); + result.addError(error); + field="taskState"; + error = new FieldError(objectName,field,defaultMessage); + result.addError(error); + } if (result.hasErrors() ) { log.warn("result.hasErrors"); for (ObjectError e : result.getAllErrors()) { @@ -232,7 +247,7 @@ public final String editTaskPost( model.addAttribute("thisProject", thisProject); //TODO: remove? model.addAttribute("thisContext", thisContext); model.addAttribute("task", task); - model.addAttribute("areas", contexts); + model.addAttribute("contexts", contexts); userSession.setLastProjectId(thisProject.getId()); userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); @@ -466,11 +481,10 @@ public final String transformTaskIntoProjectGet( @ModelAttribute("userSession") UserSessionBean userSession ) { log.info("transformTaskIntoProjectGet"); - //return transformTaskIntoProjectGet(task); userSession.setLastProjectId(rootProjectId); userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); - return rootProjectUrl; + return taskStateControllerService.transformTaskIntoProjectGet(task); } @RequestMapping(path = "/task/{taskId}/complete", method = RequestMethod.GET) diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerService.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerService.java index c7cb4597..c13aaad2 100644 --- a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerService.java +++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerService.java @@ -3,14 +3,14 @@ import org.springframework.ui.Model; import org.springframework.validation.BindingResult; import org.woehlke.simpleworklist.context.Context; -import org.woehlke.simpleworklist.session.UserSessionBean; +import org.woehlke.simpleworklist.user.session.UserSessionBean; import org.woehlke.simpleworklist.user.account.UserAccount; import java.util.Locale; public interface ProjectControllerService { - void addNewProject( + void addNewProjectToProjectIdForm( long projectId, UserSessionBean userSession, Context context, @@ -18,31 +18,24 @@ void addNewProject( Model model ); - String addNewProjectPersist( - long projectId, + void addNewProjectToProjectRootForm( UserSessionBean userSession, - Project project, Context context, - BindingResult result, Locale locale, - Model model, - String template + Model model ); - Project getProject( + String addNewProjectToProjectIdPersist( long projectId, - UserAccount userAccount, - UserSessionBean userSession - ); - - void addNewProjectToRoot( UserSessionBean userSession, + Project project, Context context, + BindingResult result, Locale locale, Model model ); - String addNewProjectToRootPersist( + String addNewProjectToProjectRootPersist( UserSessionBean userSession, Project project, Context context, @@ -51,4 +44,10 @@ String addNewProjectToRootPersist( Model model ); + Project getProject( + long projectId, + UserAccount userAccount, + UserSessionBean userSession + ); + } diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerServiceImpl.java index b8b3e902..018f2d17 100644 --- a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerServiceImpl.java +++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerServiceImpl.java @@ -5,16 +5,14 @@ import org.springframework.stereotype.Service; import org.springframework.ui.Model; import org.springframework.validation.BindingResult; -import org.woehlke.simpleworklist.breadcrumb.Breadcrumb; -import org.woehlke.simpleworklist.breadcrumb.BreadcrumbService; +import org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb; +import org.woehlke.simpleworklist.application.breadcrumb.BreadcrumbService; import org.woehlke.simpleworklist.context.Context; -import org.woehlke.simpleworklist.context.ContextService; -import org.woehlke.simpleworklist.task.Task; -import org.woehlke.simpleworklist.task.TaskService; -import org.woehlke.simpleworklist.session.UserSessionBean; +import org.woehlke.simpleworklist.user.session.UserSessionBean; import org.woehlke.simpleworklist.user.account.UserAccount; -import java.util.List; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; import java.util.Locale; import static org.woehlke.simpleworklist.project.Project.rootProjectId; @@ -24,121 +22,79 @@ public class ProjectControllerServiceImpl implements ProjectControllerService { private final ProjectService projectService; - private final TaskService taskService; - private final ContextService contextService; private final BreadcrumbService breadcrumbService; @Autowired - public ProjectControllerServiceImpl(ProjectService projectService, TaskService taskService, ContextService contextService, BreadcrumbService breadcrumbService) { + public ProjectControllerServiceImpl( + ProjectService projectService, + BreadcrumbService breadcrumbService + ) { this.projectService = projectService; - this.taskService = taskService; - this.contextService = contextService; this.breadcrumbService = breadcrumbService; } - public void addNewProject( - long projectId, - UserSessionBean userSession, - Context context, - Locale locale, - Model model + public void addNewProjectToProjectIdForm( + @Min(1L) long projectId, + @NotNull UserSessionBean userSession, + @NotNull Context context, + @NotNull Locale locale, + @NotNull Model model ) { log.info("addNewProject projectId="+projectId); UserAccount userAccount = context.getUserAccount(); userSession.setLastProjectId(projectId); model.addAttribute("userSession",userSession); - Project thisProject = null; - Project project = null; - if (projectId == 0) { - thisProject = new Project(); - thisProject.setId(0L); - project = Project.newRootProjectFactory(userAccount); - if(userSession.getLastContextId() == 0L){ - model.addAttribute("mustChooseArea", true); - project.setContext(userAccount.getDefaultContext()); - } else { - project.setContext(context); - } - } else { - thisProject = projectService.findByProjectId(projectId); - project = Project.newProjectFactory(thisProject); - } + Project thisProject = projectService.findByProjectId(projectId); + Project project = Project.newProjectFactoryForParentProject(thisProject); Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShowOneProject(thisProject,locale); model.addAttribute("breadcrumb", breadcrumb); model.addAttribute("thisProject", thisProject); model.addAttribute("project", project); } - public String addNewProjectPersist( - long projectId, - UserSessionBean userSession, - Project project, - Context context, + public String addNewProjectToProjectIdPersist( + @Min(1L) long projectId, + @NotNull UserSessionBean userSession, + @NotNull Project project, + @NotNull Context context, BindingResult result, - Locale locale, Model model, - String template + Locale locale, + Model model ){ log.info("private addNewProjectPersist projectId="+projectId+" "+project.toString()); - UserAccount userAccount = context.getUserAccount(); userSession.setLastProjectId(projectId); model.addAttribute("userSession",userSession); if(result.hasErrors()){ - Project thisProject = null; - if (projectId == 0) { - thisProject = new Project(); - thisProject.setId(0L); - } else { - thisProject = projectService.findByProjectId(projectId); - } + Project thisProject = projectService.findByProjectId(projectId); Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShowOneProject(thisProject,locale); model.addAttribute("breadcrumb", breadcrumb); model.addAttribute("thisProject", thisProject); model.addAttribute("project", project); - return template; + return "project/id/show"; } else { - if (projectId == 0) { - if(userSession.getLastContextId()>0) { - project.setContext(context); - } - project = projectService.add(project); - projectId = project.getId(); - } else { - Project thisProject = projectService.findByProjectId(projectId); - List children = thisProject.getChildren(); - children.add(project); - thisProject.setChildren(children); - project.setParent(thisProject); - project = projectService.add(project); - projectId = project.getId(); - log.info("project: "+ project.toString()); - log.info("thisProject: "+ thisProject.toString()); - } - return "redirect:/project/" + projectId; + Project thisProject = projectService.findByProjectId(projectId); + project = thisProject.addOtherProjectToChildren(project); + project = projectService.add(project); + thisProject = projectService.update(thisProject); + log.info("project: "+ project.toString()); + log.info("thisProject: "+ thisProject.toString()); + return thisProject.getUrl(); } } - public Project getProject(long projectId, UserAccount userAccount, UserSessionBean userSession){ + public Project getProject( + @Min(1L) long projectId, + @NotNull UserAccount userAccount, + @NotNull UserSessionBean userSession + ){ log.info("getProject"); - Project thisProject; - if (projectId == 0) { - thisProject = new Project(); - thisProject.setId(0L); - if(userSession.getLastContextId() == 0L){ - thisProject.setContext(userAccount.getDefaultContext()); - } else { - Context context = contextService.findByIdAndUserAccount(userSession.getLastContextId(), userAccount); - thisProject.setContext(context); - } - } else { - thisProject = projectService.findByProjectId(projectId); - } - return thisProject; + return projectService.findByProjectId(projectId); } @Override - public void addNewProjectToRoot( - UserSessionBean userSession, - Context context, + public void addNewProjectToProjectRootForm( + @NotNull UserSessionBean userSession, + @NotNull Context context, Locale locale, Model model ) { @@ -155,10 +111,10 @@ public void addNewProjectToRoot( } @Override - public String addNewProjectToRootPersist( - UserSessionBean userSession, - Project project, - Context context, + public String addNewProjectToProjectRootPersist( + @NotNull UserSessionBean userSession, + @NotNull Project project, + @NotNull Context context, BindingResult result, Locale locale, Model model diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectRepository.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectRepository.java index ec3bf42d..4c67df67 100644 --- a/src/main/java/org/woehlke/simpleworklist/project/ProjectRepository.java +++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectRepository.java @@ -9,14 +9,6 @@ @Repository public interface ProjectRepository extends JpaRepository { - List findByParentIsNull(); - - //@Deprecated - //List findByParentIsNullAndUserAccount(UserAccount userAccount); - - //@Deprecated - //List findByUserAccount(UserAccount userAccount); - List findByContext(Context context); List findByParentIsNullAndContext(Context context); diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectServiceImpl.java index d94ee484..5ec82bd2 100644 --- a/src/main/java/org/woehlke/simpleworklist/project/ProjectServiceImpl.java +++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectServiceImpl.java @@ -7,8 +7,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -16,6 +14,9 @@ import org.woehlke.simpleworklist.task.Task; import org.woehlke.simpleworklist.task.TaskRepository; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; + @Slf4j @Service @Transactional(propagation = Propagation.REQUIRED, readOnly = true) @@ -25,39 +26,28 @@ public class ProjectServiceImpl implements ProjectService { private final TaskRepository taskRepository; @Autowired - public ProjectServiceImpl(ProjectRepository projectRepository, TaskRepository taskRepository) { + public ProjectServiceImpl( + ProjectRepository projectRepository, + TaskRepository taskRepository + ) { this.projectRepository = projectRepository; this.taskRepository = taskRepository; } - /* - @Deprecated - @Override - public List findRootProjectsByUserAccount(UserAccount userAccount) { - return projectRepository.findByParentIsNullAndUserAccount(userAccount); - } - - @Deprecated - @Override - public List findAllProjectsByUserAccount(UserAccount userAccount) { - return projectRepository.findByUserAccount(userAccount); - } - */ - @Override - public List findRootProjectsByContext(Context context) { + public List findRootProjectsByContext(@NotNull Context context) { log.info("findRootProjectsByContext"); return projectRepository.findByParentIsNullAndContext(context); } @Override - public List findAllProjectsByContext(Context context) { + public List findAllProjectsByContext(@NotNull Context context) { log.info("findAllProjectsByContext"); return projectRepository.findByContext(context); } @Override - public Project findByProjectId(long projectId) { + public Project findByProjectId(@Min(1L) long projectId) { log.info("findByProjectId"); if(projectRepository.existsById(projectId)){ return projectRepository.getOne(projectId); @@ -68,7 +58,7 @@ public Project findByProjectId(long projectId) { @Override @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) - public Project add(Project entity) { + public Project add(@NotNull Project entity) { log.info("saveAndFlush"); entity.setUuid(UUID.randomUUID().toString()); return projectRepository.saveAndFlush(entity); @@ -76,14 +66,14 @@ public Project add(Project entity) { @Override @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) - public Project update(Project entity) { + public Project update(@NotNull Project entity) { log.info("saveAndFlush"); return projectRepository.saveAndFlush(entity); } @Override @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) - public Project delete(Project thisProject) { + public Project delete(@NotNull Project thisProject) { log.info("delete"); Project oldParent = thisProject.getParent(); if (oldParent != null) { @@ -96,7 +86,7 @@ public Project delete(Project thisProject) { @Override @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) - public Project moveProjectToAnotherContext(Project thisProject, Context newContext) { + public Project moveProjectToAnotherContext(@NotNull Project thisProject, @NotNull Context newContext) { log.info("----------------------------------------------------"); log.info("moveProjectToAnotherContext: Project: "+ thisProject.toString()); log.info("----------------------------------------------------"); @@ -117,7 +107,7 @@ public Project moveProjectToAnotherContext(Project thisProject, Context newConte return thisProject; } - private List getAllChildrenOfProject(Project thisProject) { + private List getAllChildrenOfProject(@NotNull Project thisProject) { log.info("getAllChildrenOfProject"); List retVal = new ArrayList<>(); retVal.add(thisProject); @@ -131,8 +121,8 @@ private List getAllChildrenOfProject(Project thisProject) { @Override @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) public Project moveProjectToAnotherProject( - Project thisProject, - Project targetProject + @NotNull Project thisProject, + @NotNull Project targetProject ) { log.info("moveProjectToAnotherProject"); Project oldParent = thisProject.getParent(); diff --git a/src/main/java/org/woehlke/simpleworklist/search/SearchController.java b/src/main/java/org/woehlke/simpleworklist/search/SearchController.java index 874a059c..1b82d821 100644 --- a/src/main/java/org/woehlke/simpleworklist/search/SearchController.java +++ b/src/main/java/org/woehlke/simpleworklist/search/SearchController.java @@ -7,11 +7,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; -import org.woehlke.simpleworklist.common.AbstractController; -import org.woehlke.simpleworklist.breadcrumb.Breadcrumb; -import org.woehlke.simpleworklist.session.UserSessionBean; +import org.woehlke.simpleworklist.application.common.AbstractController; +import org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb; +import org.woehlke.simpleworklist.user.session.UserSessionBean; import org.woehlke.simpleworklist.context.Context; -import org.woehlke.simpleworklist.user.account.UserAccount; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/woehlke/simpleworklist/search/SearchRequest.java b/src/main/java/org/woehlke/simpleworklist/search/SearchRequest.java index cd0b7eb6..a25d60cc 100644 --- a/src/main/java/org/woehlke/simpleworklist/search/SearchRequest.java +++ b/src/main/java/org/woehlke/simpleworklist/search/SearchRequest.java @@ -3,8 +3,8 @@ import lombok.*; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; -import org.woehlke.simpleworklist.common.AuditModel; -import org.woehlke.simpleworklist.common.ComparableById; +import org.woehlke.simpleworklist.application.common.AuditModel; +import org.woehlke.simpleworklist.application.common.ComparableById; import org.woehlke.simpleworklist.context.Context; import javax.persistence.*; diff --git a/src/main/java/org/woehlke/simpleworklist/search/SearchResult.java b/src/main/java/org/woehlke/simpleworklist/search/SearchResult.java index d778af4a..873b4a70 100644 --- a/src/main/java/org/woehlke/simpleworklist/search/SearchResult.java +++ b/src/main/java/org/woehlke/simpleworklist/search/SearchResult.java @@ -3,8 +3,8 @@ import lombok.*; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; -import org.woehlke.simpleworklist.common.AuditModel; -import org.woehlke.simpleworklist.common.ComparableById; +import org.woehlke.simpleworklist.application.common.AuditModel; +import org.woehlke.simpleworklist.application.common.ComparableById; import org.woehlke.simpleworklist.task.Task; import org.woehlke.simpleworklist.project.Project; diff --git a/src/main/java/org/woehlke/simpleworklist/task/Task.java b/src/main/java/org/woehlke/simpleworklist/task/Task.java index 2856b42b..0c9059b8 100644 --- a/src/main/java/org/woehlke/simpleworklist/task/Task.java +++ b/src/main/java/org/woehlke/simpleworklist/task/Task.java @@ -1,7 +1,6 @@ package org.woehlke.simpleworklist.task; import java.io.Serializable; -import java.util.ArrayList; import java.util.Date; import javax.persistence.*; @@ -18,17 +17,15 @@ import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; -import org.hibernate.validator.constraints.SafeHtml; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.Pageable; +//import org.hibernate.validator.constraints.SafeHtml; import org.springframework.format.annotation.DateTimeFormat; import org.woehlke.simpleworklist.context.Context; import org.woehlke.simpleworklist.project.Project; import org.woehlke.simpleworklist.user.account.UserAccount; -import org.woehlke.simpleworklist.common.AuditModel; -import org.woehlke.simpleworklist.common.ComparableById; +import org.woehlke.simpleworklist.application.common.AuditModel; +import org.woehlke.simpleworklist.application.common.ComparableById; import static org.hibernate.annotations.LazyToOneOption.PROXY; @@ -99,7 +96,7 @@ public class Task extends AuditModel implements Serializable, ComparableById 50){ sb.setLength(50); @@ -156,16 +154,6 @@ public String getTextShortened(){ return sb.toString(); } - /** - * performs 'history back' for taskState - */ - @Transient - public void switchToLastFocusType() { - TaskState old = this.taskState; - this.taskState = this.lastTaskState; - this.lastTaskState = old; - } - public void delete(){ pushTaskstate(TaskState.TRASH); } @@ -212,6 +200,7 @@ public void moveToInbox(){ //TODO: Due Date = Date of Today public void moveToToday(){ pushTaskstate(TaskState.TODAY); + this.dueDate = new Date(); } //TODO: delete Due Date @@ -378,8 +367,4 @@ public void merge(Task task) { this.setTaskEnergy(task.taskEnergy); this.setTaskTime(task.taskTime); } - - public static Page getEmptyPage(Pageable request){ - return new PageImpl(new ArrayList(),request,0L); - } } diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/task/TaskServiceImpl.java index 62757f08..08c87a4b 100644 --- a/src/main/java/org/woehlke/simpleworklist/task/TaskServiceImpl.java +++ b/src/main/java/org/woehlke/simpleworklist/task/TaskServiceImpl.java @@ -10,6 +10,8 @@ import org.woehlke.simpleworklist.context.Context; import org.woehlke.simpleworklist.project.Project; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -35,7 +37,11 @@ public boolean projectHasNoTasks(Project project) { @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = true) - public Page findbyTaskstate(TaskState taskState, Context context, Pageable request) { + public Page findbyTaskstate( + @NotNull TaskState taskState, + @NotNull Context context, + @NotNull Pageable request + ) { if(taskState == TaskState.FOCUS){ return taskRepository.findByFocusAndContext(true,context,request); }else { @@ -45,32 +51,26 @@ public Page findbyTaskstate(TaskState taskState, Context context, Pageable @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = true) - public Page findByProject(Project thisProject, Pageable request) { + public Page findByProject( + @NotNull Project thisProject, @NotNull Pageable request + ) { log.info("findByProject: "); log.info("---------------------------------"); log.info("thisProject: "+thisProject); log.info("---------------------------------"); - if(thisProject == null){ - return Task.getEmptyPage(request); - } else { - return taskRepository.findByProject(thisProject,request); - } + return taskRepository.findByProject(thisProject,request); } @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = true) - public Page findByRootProject(Context context, Pageable request) { + public Page findByRootProject(@NotNull Context context, @NotNull Pageable request) { log.info("findByRootProject: "); - if(context == null){ - return Task.getEmptyPage(request); - } else { - return taskRepository.findByProjectIsNullAndContext(context, request); - } + return taskRepository.findByProjectIsNullAndContext(context, request); } @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = true) - public Task findOne(long taskId) { + public Task findOne(@Min(1L) long taskId) { log.info("findOne: "); if(taskRepository.existsById(taskId)) { return taskRepository.getOne(taskId); @@ -81,7 +81,7 @@ public Task findOne(long taskId) { @Override @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) - public Task updatedViaTaskstate(Task task) { + public Task updatedViaTaskstate(@NotNull Task task) { log.info("updatedViaTaskstate"); task = taskRepository.saveAndFlush(task); log.info("persisted: " + task.getId()); @@ -90,16 +90,16 @@ public Task updatedViaTaskstate(Task task) { @Override @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) - public Task updatedViaProject(Task task) { + public Task updatedViaProject(@NotNull Task task) { log.info("updatedViaProject"); task = taskRepository.saveAndFlush(task); - log.info("persisted: " + task.getId()); + log.info("persisted Task: " + task.getId()); return task; } @Override @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) - public Task addToProject(Task task) { + public Task addToProject(@NotNull Task task) { log.info("addToProject"); task.setUuid(UUID.randomUUID().toString()); task = taskRepository.saveAndFlush(task); @@ -109,7 +109,7 @@ public Task addToProject(Task task) { @Override @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) - public Task addToRootProject(Task task) { + public Task addToRootProject(@NotNull Task task) { log.info("addToRootProject"); task.setUuid(UUID.randomUUID().toString()); task.unsetFocus(); @@ -120,7 +120,7 @@ public Task addToRootProject(Task task) { @Override @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) - public Task moveTaskToRootProject(Task task) { + public Task moveTaskToRootProject(@NotNull Task task) { task.setRootProject(); long maxOrderIdProject = this.getMaxOrderIdProject( task.getProject(), task.getContext() @@ -131,7 +131,7 @@ public Task moveTaskToRootProject(Task task) { @Override @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) - public Task moveTaskToAnotherProject(Task task, Project project) { + public Task moveTaskToAnotherProject(@NotNull Task task, @NotNull Project project) { boolean okContext = task.hasSameContextAs(project); if(okContext) { task.setProject(project); @@ -146,7 +146,7 @@ public Task moveTaskToAnotherProject(Task task, Project project) { } @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) - public Task moveTaskToInbox(Task task) { + public Task moveTaskToInbox(@NotNull Task task) { long newOrderIdTaskState = this.getMaxOrderIdTaskState( TaskState.INBOX, task.getContext() @@ -159,7 +159,7 @@ public Task moveTaskToInbox(Task task) { } @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) - public Task moveTaskToToday(Task task) { + public Task moveTaskToToday(@NotNull Task task) { Date now = new Date(); long newOrderIdTaskState = this.getMaxOrderIdTaskState( TaskState.TODAY, @@ -174,7 +174,7 @@ public Task moveTaskToToday(Task task) { } @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) - public Task moveTaskToNext(Task task) { + public Task moveTaskToNext(@NotNull Task task) { long newOrderIdTaskState = this.getMaxOrderIdTaskState( TaskState.NEXT, task.getContext() @@ -187,7 +187,7 @@ public Task moveTaskToNext(Task task) { } @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) - public Task moveTaskToWaiting(Task task) { + public Task moveTaskToWaiting(@NotNull Task task) { long newOrderIdTaskState = this.getMaxOrderIdTaskState( TaskState.WAITING, task.getContext() @@ -201,7 +201,7 @@ public Task moveTaskToWaiting(Task task) { @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) - public Task moveTaskToSomeday(Task task) { + public Task moveTaskToSomeday(@NotNull Task task) { long newOrderIdTaskState = this.getMaxOrderIdTaskState( TaskState.SOMEDAY, task.getContext() @@ -214,7 +214,7 @@ public Task moveTaskToSomeday(Task task) { } @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) - public Task moveTaskToFocus(Task task) { + public Task moveTaskToFocus(@NotNull Task task) { long newOrderIdTaskState = this.getMaxOrderIdTaskState( TaskState.FOCUS, task.getContext() @@ -227,7 +227,7 @@ public Task moveTaskToFocus(Task task) { } @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) - public Task moveTaskToCompleted(Task task) { + public Task moveTaskToCompleted(@NotNull Task task) { long newOrderIdTaskState = this.getMaxOrderIdTaskState( TaskState.COMPLETED, task.getContext() @@ -241,7 +241,7 @@ public Task moveTaskToCompleted(Task task) { @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) - public Task moveTaskToTrash(Task task) { + public Task moveTaskToTrash(@NotNull Task task) { long newOrderIdTaskState = this.getMaxOrderIdTaskState( TaskState.TRASH, task.getContext() @@ -255,7 +255,7 @@ public Task moveTaskToTrash(Task task) { @Override @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) - public void moveAllCompletedToTrash(Context context) { + public void moveAllCompletedToTrash(@NotNull Context context) { long maxOrderIdTaskState = this.getMaxOrderIdTaskStateFor( TaskState.TRASH, context @@ -275,7 +275,7 @@ public void moveAllCompletedToTrash(Context context) { @Override @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) - public void emptyTrash(Context context) { + public void emptyTrash(@NotNull Context context) { List taskList = taskRepository.findByTaskStateAndContext( TaskState.TRASH, context @@ -290,7 +290,7 @@ public void emptyTrash(Context context) { @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = true) - public long getMaxOrderIdTaskState(TaskState taskState, Context context) { + public long getMaxOrderIdTaskState(@NotNull TaskState taskState, @NotNull Context context) { Task task = taskRepository.findTopByTaskStateAndContextOrderByOrderIdTaskStateDesc( taskState, context @@ -300,7 +300,7 @@ public long getMaxOrderIdTaskState(TaskState taskState, Context context) { @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = true) - public long getMaxOrderIdProject(Project project, Context context) { + public long getMaxOrderIdProject(@NotNull Project project, @NotNull Context context) { Task task = taskRepository.findTopByProjectAndContextOrderByOrderIdProjectDesc( project, context @@ -310,7 +310,7 @@ public long getMaxOrderIdProject(Project project, Context context) { @Override @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) - public void moveOrderIdTaskState( Task sourceTask, Task destinationTask ) { + public void moveOrderIdTaskState(@NotNull Task sourceTask, @NotNull Task destinationTask ) { boolean notEqualsId = ! sourceTask.equalsById(destinationTask); boolean notEquals = ! sourceTask.equalsByUniqueConstraint(destinationTask); boolean sameContext = sourceTask.hasSameContextAs(destinationTask); @@ -330,7 +330,7 @@ public void moveOrderIdTaskState( Task sourceTask, Task destinationTask ) { @Override @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) - public void moveOrderIdRootProject( Task sourceTask, Task destinationTask ) { + public void moveOrderIdRootProject(@NotNull Task sourceTask,@NotNull Task destinationTask ) { boolean sourceTaskRoot = destinationTask.isInRootProject(); boolean destinationTaskRoot = destinationTask.isInRootProject(); boolean sameContext = sourceTask.hasSameContextAs(destinationTask); @@ -347,7 +347,7 @@ public void moveOrderIdRootProject( Task sourceTask, Task destinationTask ) { @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = true) - public long getMaxOrderIdRootProject(Context context) { + public long getMaxOrderIdRootProject(@NotNull Context context) { Task task = taskRepository.findTopByProjectAndContextOrderByOrderIdProjectDesc( null, context @@ -357,7 +357,7 @@ public long getMaxOrderIdRootProject(Context context) { @Override @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) - public void moveOrderIdProject( Task sourceTask, Task destinationTask ) { + public void moveOrderIdProject(@NotNull Task sourceTask, @NotNull Task destinationTask ) { Project project = sourceTask.getProject(); boolean okProject = destinationTask.hasProject(project); boolean sameContext = sourceTask.hasSameContextAs(destinationTask); @@ -379,7 +379,7 @@ public void moveOrderIdProject( Task sourceTask, Task destinationTask ) { * @param sourceTask * @param destinationTask */ - private void moveTasksUpByTaskState( Task sourceTask, Task destinationTask ) { + private void moveTasksUpByTaskState(@NotNull Task sourceTask, @NotNull Task destinationTask ) { TaskState taskState = sourceTask.getTaskState(); Context context = sourceTask.getContext(); long lowerOrderIdTaskState = destinationTask.getOrderIdTaskState(); @@ -401,7 +401,7 @@ private void moveTasksUpByTaskState( Task sourceTask, Task destinationTask ) { } - private long getMaxOrderIdTaskStateFor(TaskState taskState, Context context ){ + private long getMaxOrderIdTaskStateFor(@NotNull TaskState taskState, @NotNull Context context ){ Task task = taskRepository.findTopByTaskStateAndContextOrderByOrderIdTaskStateDesc( taskState, context @@ -416,7 +416,7 @@ private long getMaxOrderIdTaskStateFor(TaskState taskState, Context context ){ * @param sourceTask * @param destinationTask */ - private void moveTasksDownByTaskState( Task sourceTask, Task destinationTask ) { + private void moveTasksDownByTaskState(@NotNull Task sourceTask, @NotNull Task destinationTask ) { TaskState taskState = sourceTask.getTaskState(); Context context = sourceTask.getContext(); long lowerOrderIdTaskState = sourceTask.getOrderIdTaskState(); @@ -437,7 +437,7 @@ private void moveTasksDownByTaskState( Task sourceTask, Task destinationTask ) { taskRepository.saveAll(tasks); } - private void moveTasksUpByProject( Task sourceTask, Task destinationTask ) { + private void moveTasksUpByProject(@NotNull Task sourceTask, @NotNull Task destinationTask ) { Context context = sourceTask.getContext(); Project project = sourceTask.getProject(); long lowerOrderIdProject = destinationTask.getOrderIdProject(); @@ -458,7 +458,7 @@ private void moveTasksUpByProject( Task sourceTask, Task destinationTask ) { taskRepository.saveAll(tasks); } - private void moveTasksDownByProject( Task sourceTask, Task destinationTask ) { + private void moveTasksDownByProject(@NotNull Task sourceTask, @NotNull Task destinationTask) { Context context = sourceTask.getContext(); Project project = sourceTask.getProject(); long lowerOrderIdProject = sourceTask.getOrderIdProject(); @@ -481,7 +481,7 @@ private void moveTasksDownByProject( Task sourceTask, Task destinationTask ) { @Override @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) - public Task addToInbox(Task task) { + public Task addToInbox(@NotNull Task task) { log.info("addToInbox"); task.setUuid(UUID.randomUUID().toString()); task.setRootProject(); diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskState.java b/src/main/java/org/woehlke/simpleworklist/task/TaskState.java index fd1e5966..f71b2ca7 100644 --- a/src/main/java/org/woehlke/simpleworklist/task/TaskState.java +++ b/src/main/java/org/woehlke/simpleworklist/task/TaskState.java @@ -39,6 +39,10 @@ public String getValue(){ return this.name(); } + public String getType(){ + return this.name().toLowerCase(); + } + public String getCode(){ return "layout.page."+this.name().toLowerCase(); } diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskStateControllerService.java b/src/main/java/org/woehlke/simpleworklist/task/TaskStateControllerService.java index d4305e9f..fcae2756 100644 --- a/src/main/java/org/woehlke/simpleworklist/task/TaskStateControllerService.java +++ b/src/main/java/org/woehlke/simpleworklist/task/TaskStateControllerService.java @@ -3,7 +3,7 @@ import org.springframework.data.domain.Pageable; import org.springframework.ui.Model; import org.woehlke.simpleworklist.context.Context; -import org.woehlke.simpleworklist.session.UserSessionBean; +import org.woehlke.simpleworklist.user.session.UserSessionBean; import java.util.Locale; diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskStateControllerServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/task/TaskStateControllerServiceImpl.java index 95d95e1a..deef5452 100644 --- a/src/main/java/org/woehlke/simpleworklist/task/TaskStateControllerServiceImpl.java +++ b/src/main/java/org/woehlke/simpleworklist/task/TaskStateControllerServiceImpl.java @@ -6,13 +6,14 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.ui.Model; -import org.woehlke.simpleworklist.breadcrumb.Breadcrumb; -import org.woehlke.simpleworklist.breadcrumb.BreadcrumbService; +import org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb; +import org.woehlke.simpleworklist.application.breadcrumb.BreadcrumbService; import org.woehlke.simpleworklist.context.Context; import org.woehlke.simpleworklist.project.Project; import org.woehlke.simpleworklist.project.ProjectService; -import org.woehlke.simpleworklist.session.UserSessionBean; +import org.woehlke.simpleworklist.user.session.UserSessionBean; +import javax.validation.constraints.NotNull; import java.util.Locale; @Slf4j @@ -27,7 +28,8 @@ public class TaskStateControllerServiceImpl implements TaskStateControllerServic public TaskStateControllerServiceImpl( BreadcrumbService breadcrumbService, TaskService taskService, - ProjectService projectService) { + ProjectService projectService) + { this.breadcrumbService = breadcrumbService; this.taskService = taskService; this.projectService = projectService; @@ -35,12 +37,12 @@ public TaskStateControllerServiceImpl( @Override public String getTaskStatePage( - TaskState taskState, - Context context, - Pageable pageRequest, - UserSessionBean userSession, - Locale locale, - Model model + @NotNull TaskState taskState, + @NotNull Context context, + @NotNull Pageable pageRequest, + @NotNull UserSessionBean userSession, + @NotNull Locale locale, + @NotNull Model model ){ log.info("getTaskStatePage"); userSession.setLastTaskState(taskState); @@ -48,13 +50,13 @@ public String getTaskStatePage( Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForTaskstate(taskState,locale); model.addAttribute("breadcrumb", breadcrumb); model.addAttribute("taskPage", taskPage); - model.addAttribute("taskstateType", taskState.name().toLowerCase()); + model.addAttribute("taskstateType", taskState.getType() ); model.addAttribute("userSession", userSession); return taskState.getTemplate(); } @Override - public String transformTaskIntoProjectGet(Task task) { + public String transformTaskIntoProjectGet(@NotNull Task task) { Project thisProject = new Project(); thisProject.setName(task.getTitle()); thisProject.setDescription(task.getText()); diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskStateTabController.java b/src/main/java/org/woehlke/simpleworklist/task/TaskStateTabController.java index f0f5c186..b455adc7 100644 --- a/src/main/java/org/woehlke/simpleworklist/task/TaskStateTabController.java +++ b/src/main/java/org/woehlke/simpleworklist/task/TaskStateTabController.java @@ -10,9 +10,9 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.woehlke.simpleworklist.common.AbstractController; +import org.woehlke.simpleworklist.application.common.AbstractController; import org.woehlke.simpleworklist.context.Context; -import org.woehlke.simpleworklist.session.UserSessionBean; +import org.woehlke.simpleworklist.user.session.UserSessionBean; import java.util.Locale; diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java b/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java index 537baa5c..7d1bd488 100644 --- a/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java +++ b/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java @@ -4,18 +4,20 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.validation.BindingResult; +import org.springframework.validation.FieldError; import org.springframework.validation.ObjectError; import org.springframework.web.bind.annotation.*; -import org.woehlke.simpleworklist.breadcrumb.Breadcrumb; -import org.woehlke.simpleworklist.common.AbstractController; +import org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb; +import org.woehlke.simpleworklist.application.common.AbstractController; import org.woehlke.simpleworklist.context.Context; import org.woehlke.simpleworklist.project.Project; -import org.woehlke.simpleworklist.session.UserSessionBean; +import org.woehlke.simpleworklist.user.session.UserSessionBean; import org.springframework.beans.factory.annotation.Autowired; import org.woehlke.simpleworklist.user.account.UserAccount; import javax.validation.Valid; +import javax.validation.constraints.NotNull; import java.util.List; import java.util.Locale; @@ -50,6 +52,7 @@ public final String addNewTaskToInboxGet( task.setTaskState(TaskState.INBOX); task.setTaskEnergy(TaskEnergy.NONE); task.setTaskTime(TaskTime.NONE); + task.unsetFocus(); Boolean mustChooseContext = false; if(userSession.getLastContextId() == 0L){ mustChooseContext = true; @@ -68,8 +71,8 @@ public final String addNewTaskToInboxGet( @RequestMapping(path = "/add", method = RequestMethod.POST) public final String addNewTaskToInboxPost( - @ModelAttribute("userSession") UserSessionBean userSession, - @Valid Task task, + @NotNull @ModelAttribute("userSession") UserSessionBean userSession, + @NotNull @Valid Task task, BindingResult result, Locale locale, Model model @@ -96,8 +99,8 @@ public final String addNewTaskToInboxPost( @RequestMapping(path = "/{taskId}/edit", method = RequestMethod.GET) public final String editTaskGet( - @PathVariable("taskId") Task task, - @ModelAttribute("userSession") UserSessionBean userSession, + @NotNull @PathVariable("taskId") Task task, + @NotNull @ModelAttribute("userSession") UserSessionBean userSession, Locale locale, Model model ) { log.info("editTaskGet"); @@ -117,7 +120,7 @@ public final String editTaskGet( model.addAttribute("thisProject", thisProject); model.addAttribute("thisContext", thisContext); model.addAttribute("task", task); - model.addAttribute("areas", contexts); + model.addAttribute("contextss", contexts); return "taskstate/task/edit"; } else { return "redirect:/taskstate/inbox"; @@ -127,13 +130,23 @@ public final String editTaskGet( @RequestMapping(path = "/{taskId}/edit", method = RequestMethod.POST) public final String editTaskPost( @PathVariable long taskId, - @Valid Task task, - @ModelAttribute("userSession") UserSessionBean userSession, + @NotNull @Valid Task task, + @NotNull @ModelAttribute("userSession") UserSessionBean userSession, BindingResult result, Locale locale, Model model ) { log.info("editTaskPost"); + if(task.getTaskState()==TaskState.SCHEDULED && task.getDueDate()==null){ + String objectName="task"; + String field="dueDate"; + String defaultMessage="you need a due Date to schedule the Task"; + FieldError error = new FieldError(objectName,field,defaultMessage); + result.addError(error); + field="taskState"; + error = new FieldError(objectName,field,defaultMessage); + result.addError(error); + } if (result.hasErrors() ) { log.warn("result.hasErrors"); for (ObjectError e : result.getAllErrors()) { @@ -157,7 +170,7 @@ public final String editTaskPost( model.addAttribute("thisProject", thisProject); model.addAttribute("thisContext", thisContext); model.addAttribute("task", task); - model.addAttribute("areas", contexts); + model.addAttribute("contexts", contexts); return "taskstate/task/edit"; } else { task.unsetFocus(); @@ -171,9 +184,9 @@ public final String editTaskPost( @RequestMapping(path = "/{taskId}/changeorderto/{destinationTaskId}", method = RequestMethod.GET) public String changeTaskOrderId( - @PathVariable("taskId") Task sourceTask, - @PathVariable("destinationTaskId") Task destinationTask, - @ModelAttribute("userSession") UserSessionBean userSession, + @NotNull @PathVariable("taskId") Task sourceTask, + @NotNull @PathVariable("destinationTaskId") Task destinationTask, + @NotNull @ModelAttribute("userSession") UserSessionBean userSession, Model model ){ userSession.setLastTaskState(sourceTask.getTaskState()); @@ -184,85 +197,80 @@ public String changeTaskOrderId( log.info("destination Task: "+destinationTask.toString()); log.info("---------------------------------------------"); taskService.moveOrderIdTaskState(sourceTask, destinationTask); - return "redirect:/taskstate/" + sourceTask.getTaskState().name().toLowerCase(); + return sourceTask.getTaskState().getUrl(); } @RequestMapping(path = "/{taskId}/move/to/project/{projectId}", method = RequestMethod.GET) public final String moveTaskToAnotherProject( - @PathVariable("taskId") Task task, - @PathVariable long projectId + @NotNull @PathVariable("taskId") Task task, + @NotNull @PathVariable("projectId") Project project ) { - if(projectId == 0) { - task = taskService.moveTaskToRootProject(task); - } else { - Project project = projectService.findByProjectId(projectId); - task = taskService.moveTaskToAnotherProject(task,project); - } - return "redirect:/project/" + projectId + "/"; + task = taskService.moveTaskToAnotherProject(task,project); + return project.getUrl(); } @RequestMapping(path = "/{taskId}/move/to/taskstate/inbox", method = RequestMethod.GET) - public final String moveTaskToInbox(@PathVariable("taskId") Task task) { + public final String moveTaskToInbox(@NotNull @PathVariable("taskId") Task task) { log.info("dragged and dropped "+task.getId()+" to inbox"); task.moveToInbox(); - taskService.updatedViaTaskstate(task); - return "redirect:/taskstate/inbox"; + task = taskService.updatedViaTaskstate(task); + return task.getTaskState().getUrl(); } @RequestMapping(path = "/{taskId}/move/to/taskstate/today", method = RequestMethod.GET) - public final String moveTaskToToday(@PathVariable("taskId") Task task) { + public final String moveTaskToToday(@NotNull @PathVariable("taskId") Task task) { log.info("dragged and dropped "+task.getId()+" to today"); task.moveToToday(); - taskService.updatedViaTaskstate(task); - return "redirect:/taskstate/today"; + task = taskService.updatedViaTaskstate(task); + return task.getTaskState().getUrl(); } @RequestMapping(path = "/{taskId}/move/to/taskstate/next", method = RequestMethod.GET) - public final String moveTaskToNext(@PathVariable("taskId") Task task) { + public final String moveTaskToNext(@NotNull @PathVariable("taskId") Task task) { log.info("dragged and dropped "+task.getId()+" to next"); task.moveToNext(); - taskService.updatedViaTaskstate(task); - return "redirect:/taskstate/next"; + task = taskService.updatedViaTaskstate(task); + return task.getTaskState().getUrl(); } @RequestMapping(path = "/{taskId}/move/to/taskstate/waiting", method = RequestMethod.GET) - public final String moveTaskToWaiting(@PathVariable("taskId") Task task) { + public final String moveTaskToWaiting(@NotNull @PathVariable("taskId") Task task) { log.info("dragged and dropped "+task.getId()+" to waiting"); task.moveToWaiting(); - taskService.updatedViaTaskstate(task); - return "redirect:/taskstate/waiting"; + task = taskService.updatedViaTaskstate(task); + return task.getTaskState().getUrl(); } @RequestMapping(path = "/{taskId}/move/to/taskstate/someday", method = RequestMethod.GET) - public final String moveTaskToSomeday(@PathVariable("taskId") Task task) { + public final String moveTaskToSomeday(@NotNull @PathVariable("taskId") Task task) { log.info("dragged and dropped "+task.getId()+" to someday"); task.moveToSomeday(); - taskService.updatedViaTaskstate(task); - return "redirect:/taskstate/someday"; + task = taskService.updatedViaTaskstate(task); + return task.getTaskState().getUrl(); } @RequestMapping(path = "/{taskId}/move/to/taskstate/focus", method = RequestMethod.GET) - public final String moveTaskToFocus(@PathVariable("taskId") Task task) { + public final String moveTaskToFocus(@NotNull @PathVariable("taskId") Task task) { log.info("dragged and dropped "+task.getId()+" to focus"); task.moveToFocus(); - taskService.updatedViaTaskstate(task); - return "redirect:/taskstate/focus"; + task = taskService.updatedViaTaskstate(task); + return task.getTaskState().getUrl(); } @RequestMapping(path = "/{taskId}/move/to/taskstate/completed", method = RequestMethod.GET) - public final String moveTaskToCompleted(@PathVariable("taskId") Task task) { + public final String moveTaskToCompleted(@NotNull @PathVariable("taskId") Task task) { log.info("dragged and dropped "+task.getId()+" to completed"); task.moveToCompletedTasks(); - taskService.updatedViaTaskstate(task); - return "redirect:/taskstate/completed"; + task = taskService.updatedViaTaskstate(task); + return task.getTaskState().getUrl(); } @RequestMapping(path = "/{taskId}/move/to/trash", method = RequestMethod.GET) - public final String moveTaskToTrash(@PathVariable("taskId") Task task) { + public final String moveTaskToTrash(@NotNull @PathVariable("taskId") Task task) { log.info("dragged and dropped "+task.getId()+" to trash"); task.moveToTrash(); - taskService.updatedViaTaskstate(task); - return "redirect:/taskstate/trash"; + task = taskService.updatedViaTaskstate(task); + return task.getTaskState().getUrl(); } @RequestMapping(path = "/completed/move/to/trash", method = RequestMethod.GET) @@ -285,7 +293,7 @@ public final String emptyTrash( @RequestMapping(path = "/{taskId}/delete", method = RequestMethod.GET) - public final String deleteTaskGet(@PathVariable("taskId") Task task) { + public final String deleteTaskGet(@NotNull @PathVariable("taskId") Task task) { log.info("deleteTaskGet"); if(task!= null){ task.delete(); @@ -295,77 +303,56 @@ public final String deleteTaskGet(@PathVariable("taskId") Task task) { } @RequestMapping(path = "/{taskId}/undelete", method = RequestMethod.GET) - public final String undeleteTaskGet(@PathVariable("taskId") Task task) { + public final String undeleteTaskGet(@NotNull @PathVariable("taskId") Task task) { log.info("undeleteTaskGet"); - if(task!= null) { - task.undelete(); - taskService.updatedViaTaskstate(task); - return "redirect:/taskstate/completed"; - } else { - return "redirect:/taskstate/trash"; - } + task.undelete(); + taskService.updatedViaTaskstate(task); + return "redirect:/taskstate/completed"; } @RequestMapping(path = "/{taskId}/transform", method = RequestMethod.GET) - public final String transformTaskIntoProjectGet(@PathVariable("taskId") Task task) { + public final String transformTaskIntoProjectGet(@NotNull @PathVariable("taskId") Task task) { log.info("transformTaskIntoProjectGet"); return taskStateControllerService.transformTaskIntoProjectGet(task); } @RequestMapping(path = "/{taskId}/complete", method = RequestMethod.GET) public final String setDoneTaskGet( - @PathVariable("taskId") Task task + @NotNull @PathVariable("taskId") Task task ) { - if(task != null){ - task.complete(); - long maxOrderIdTaskState = taskService.getMaxOrderIdTaskState(TaskState.COMPLETED,task.getContext()); - task.setOrderIdTaskState(++maxOrderIdTaskState); - task = taskService.updatedViaTaskstate(task); - return task.getUrl(); - } - return "redirect:/taskstate/completed"; + task.complete(); + long maxOrderIdTaskState = taskService.getMaxOrderIdTaskState(TaskState.COMPLETED,task.getContext()); + task.setOrderIdTaskState(++maxOrderIdTaskState); + task = taskService.updatedViaTaskstate(task); + return task.getUrl(); } @RequestMapping(path = "/{taskId}/incomplete", method = RequestMethod.GET) public final String unsetDoneTaskGet( - @PathVariable("taskId") Task task + @NotNull @PathVariable("taskId") Task task ) { - if(task !=null) { - task.incomplete(); - long maxOrderIdTaskState = taskService.getMaxOrderIdTaskState(task.getTaskState(),task.getContext()); - task.setOrderIdTaskState(++maxOrderIdTaskState); - task = taskService.updatedViaTaskstate(task); - return task.getUrl(); - } else { - return "redirect:/taskstate/inbox"; - } + task.incomplete(); + long maxOrderIdTaskState = taskService.getMaxOrderIdTaskState(task.getTaskState(),task.getContext()); + task.setOrderIdTaskState(++maxOrderIdTaskState); + task = taskService.updatedViaTaskstate(task); + return task.getUrl(); } @RequestMapping(path = "/{taskId}/setfocus", method = RequestMethod.GET) public final String setFocusGet( - @PathVariable("taskId") Task task, - @RequestParam(required=false) String back + @NotNull @PathVariable("taskId") Task task ){ - if(task !=null) { - task.setFocus(); - task = taskService.updatedViaTaskstate(task); - return task.getUrl(); - } else { - return "redirect:/taskstate/inbox"; - } + task.setFocus(); + task = taskService.updatedViaTaskstate(task); + return task.getUrl(); } @RequestMapping(path = "/{taskId}/unsetfocus", method = RequestMethod.GET) public final String unsetFocusGet( - @PathVariable("taskId") Task task, - @RequestParam(required=false) String back + @NotNull @PathVariable("taskId") Task task ){ - if(task !=null) { - task.unsetFocus(); - task = taskService.updatedViaTaskstate(task); - return task.getUrl(); - } else { - return "redirect:/taskstate/inbox"; - } + task.unsetFocus(); + task = taskService.updatedViaTaskstate(task); + return task.getUrl(); } } diff --git a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccount.java b/src/main/java/org/woehlke/simpleworklist/user/account/UserAccount.java index 1d8c6d3c..cf060724 100644 --- a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccount.java +++ b/src/main/java/org/woehlke/simpleworklist/user/account/UserAccount.java @@ -6,11 +6,11 @@ import lombok.Getter; import lombok.Setter; import lombok.ToString; -import org.hibernate.validator.constraints.SafeHtml; +//import org.hibernate.validator.constraints.SafeHtml; import org.woehlke.simpleworklist.context.Context; -import org.woehlke.simpleworklist.common.AuditModel; -import org.woehlke.simpleworklist.common.ComparableById; -import org.woehlke.simpleworklist.language.Language; +import org.woehlke.simpleworklist.application.common.AuditModel; +import org.woehlke.simpleworklist.application.common.ComparableById; +import org.woehlke.simpleworklist.application.language.Language; import java.io.Serializable; import java.util.Date; diff --git a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountForm.java b/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountForm.java index 16b10556..1cdd6613 100644 --- a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountForm.java +++ b/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountForm.java @@ -7,7 +7,7 @@ import javax.validation.constraints.NotBlank; import lombok.*; -import org.hibernate.validator.constraints.SafeHtml; +//import org.hibernate.validator.constraints.SafeHtml; import java.io.Serializable; @@ -29,19 +29,19 @@ public class UserAccountForm implements Serializable { private String userEmail; //TODO: Messages i18n - @SafeHtml(whitelistType= SafeHtml.WhiteListType.NONE) + //@SafeHtml(whitelistType= SafeHtml.WhiteListType.NONE) @NotNull(message = "Fullname is compulsory") @NotBlank(message = "Fullname is compulsory") private String userFullname; //TODO: Messages i18n - @SafeHtml(whitelistType= SafeHtml.WhiteListType.NONE) + //@SafeHtml(whitelistType= SafeHtml.WhiteListType.NONE) @NotNull(message = "Password is compulsory") @NotBlank(message = "Password is compulsory") private String userPassword; //TODO: Messages i18n - @SafeHtml(whitelistType= SafeHtml.WhiteListType.NONE) + //@SafeHtml(whitelistType= SafeHtml.WhiteListType.NONE) @NotNull(message = "Password is compulsory") @NotBlank(message = "Password is compulsory") private String userPasswordConfirmation; diff --git a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountPassword.java b/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountPassword.java index d09ef9ad..4ab2963b 100644 --- a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountPassword.java +++ b/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountPassword.java @@ -2,8 +2,8 @@ import lombok.Getter; import lombok.Setter; -import org.woehlke.simpleworklist.common.AuditModel; -import org.woehlke.simpleworklist.common.ComparableById; +import org.woehlke.simpleworklist.application.common.AuditModel; +import org.woehlke.simpleworklist.application.common.ComparableById; import javax.persistence.*; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountServiceImpl.java index e9127806..3b775d4b 100644 --- a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountServiceImpl.java +++ b/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountServiceImpl.java @@ -4,7 +4,6 @@ import java.util.*; import lombok.extern.slf4j.Slf4j; -import org.hibernate.id.UUIDGenerator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; @@ -15,10 +14,10 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import org.woehlke.simpleworklist.context.Context; -import org.woehlke.simpleworklist.user.messages.User2UserMessage; -import org.woehlke.simpleworklist.language.Language; +import org.woehlke.simpleworklist.user.chat.User2UserMessage; +import org.woehlke.simpleworklist.application.language.Language; import org.woehlke.simpleworklist.context.ContextRepository; -import org.woehlke.simpleworklist.user.messages.User2UserMessageRepository; +import org.woehlke.simpleworklist.user.chat.User2UserMessageRepository; @Slf4j @Service("userAccountService") diff --git a/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessage.java b/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessage.java similarity index 88% rename from src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessage.java rename to src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessage.java index e142452c..76524c53 100644 --- a/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessage.java +++ b/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessage.java @@ -1,10 +1,10 @@ -package org.woehlke.simpleworklist.user.messages; +package org.woehlke.simpleworklist.user.chat; import lombok.*; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; -import org.hibernate.validator.constraints.SafeHtml; -import org.woehlke.simpleworklist.common.AuditModel; +//import org.hibernate.validator.constraints.SafeHtml; +import org.woehlke.simpleworklist.application.common.AuditModel; import org.woehlke.simpleworklist.user.account.UserAccount; import javax.persistence.*; @@ -47,7 +47,7 @@ public class User2UserMessage extends AuditModel implements Serializable { ) private Long id; - @SafeHtml(whitelistType= SafeHtml.WhiteListType.SIMPLE_TEXT) + //@SafeHtml(whitelistType= SafeHtml.WhiteListType.SIMPLE_TEXT) @NotBlank @Length(min=1,max=65535) @Column(name="message_text", nullable = false, length = 65535, columnDefinition="text") diff --git a/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessageController.java b/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageController.java similarity index 94% rename from src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessageController.java rename to src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageController.java index a794bd2d..40951615 100644 --- a/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessageController.java +++ b/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageController.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.user.messages; +package org.woehlke.simpleworklist.user.chat; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; @@ -13,9 +13,9 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.woehlke.simpleworklist.common.AbstractController; -import org.woehlke.simpleworklist.breadcrumb.Breadcrumb; -import org.woehlke.simpleworklist.session.UserSessionBean; +import org.woehlke.simpleworklist.application.common.AbstractController; +import org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb; +import org.woehlke.simpleworklist.user.session.UserSessionBean; import org.woehlke.simpleworklist.context.Context; import org.woehlke.simpleworklist.user.account.UserAccount; diff --git a/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessageFormBean.java b/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageFormBean.java similarity index 72% rename from src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessageFormBean.java rename to src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageFormBean.java index bf734448..8ce41150 100644 --- a/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessageFormBean.java +++ b/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageFormBean.java @@ -1,9 +1,9 @@ -package org.woehlke.simpleworklist.user.messages; +package org.woehlke.simpleworklist.user.chat; import lombok.*; import org.hibernate.validator.constraints.Length; -import org.hibernate.validator.constraints.SafeHtml; +//import org.hibernate.validator.constraints.SafeHtml; import javax.validation.constraints.NotBlank; import java.io.Serializable; @@ -18,7 +18,7 @@ public class User2UserMessageFormBean implements Serializable { private static final long serialVersionUID = 1576610181966480168L; - @SafeHtml(whitelistType= SafeHtml.WhiteListType.SIMPLE_TEXT) + //@SafeHtml(whitelistType= SafeHtml.WhiteListType.SIMPLE_TEXT) @NotBlank @Length(min=1,max=65535) private String messageText; diff --git a/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessageRepository.java b/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageRepository.java similarity index 91% rename from src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessageRepository.java rename to src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageRepository.java index 7924ca60..11e9a508 100644 --- a/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessageRepository.java +++ b/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageRepository.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.user.messages; +package org.woehlke.simpleworklist.user.chat; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -6,7 +6,6 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import org.woehlke.simpleworklist.user.messages.User2UserMessage; import org.woehlke.simpleworklist.user.account.UserAccount; import java.util.List; diff --git a/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessageService.java b/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageService.java similarity index 91% rename from src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessageService.java rename to src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageService.java index 5b6117f4..81c24217 100644 --- a/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessageService.java +++ b/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageService.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.user.messages; +package org.woehlke.simpleworklist.user.chat; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessageServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageServiceImpl.java similarity index 96% rename from src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessageServiceImpl.java rename to src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageServiceImpl.java index bc132754..52a69d28 100644 --- a/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessageServiceImpl.java +++ b/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageServiceImpl.java @@ -1,8 +1,6 @@ -package org.woehlke.simpleworklist.user.messages; +package org.woehlke.simpleworklist.user.chat; import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/woehlke/simpleworklist/user/login/LoginForm.java b/src/main/java/org/woehlke/simpleworklist/user/login/LoginForm.java index 930682ea..03d60553 100644 --- a/src/main/java/org/woehlke/simpleworklist/user/login/LoginForm.java +++ b/src/main/java/org/woehlke/simpleworklist/user/login/LoginForm.java @@ -6,7 +6,7 @@ import javax.validation.constraints.NotBlank; import lombok.*; -import org.hibernate.validator.constraints.SafeHtml; +//import org.hibernate.validator.constraints.SafeHtml; import java.io.Serializable; @@ -27,7 +27,7 @@ public class LoginForm implements Serializable { private String userEmail; //TODO: Messages i18n - @SafeHtml(whitelistType= SafeHtml.WhiteListType.NONE) + //@SafeHtml(whitelistType= SafeHtml.WhiteListType.NONE) @NotNull(message = "Password is compulsory") @NotBlank(message = "Password is compulsory") private String userPassword; diff --git a/src/main/java/org/woehlke/simpleworklist/user/login/LoginSuccessHandler.java b/src/main/java/org/woehlke/simpleworklist/user/login/LoginSuccessHandler.java index 4e7375c8..ef7b96ae 100644 --- a/src/main/java/org/woehlke/simpleworklist/user/login/LoginSuccessHandler.java +++ b/src/main/java/org/woehlke/simpleworklist/user/login/LoginSuccessHandler.java @@ -21,13 +21,17 @@ */ @Slf4j @Component -public class LoginSuccessHandler extends SavedRequestAwareAuthenticationSuccessHandler implements AuthenticationSuccessHandler { +public class LoginSuccessHandler extends SavedRequestAwareAuthenticationSuccessHandler + implements AuthenticationSuccessHandler { private final UserAccountLoginSuccessService userAccountLoginSuccessService; private final LocaleResolver localeResolver; @Autowired - public LoginSuccessHandler(UserAccountLoginSuccessService userAccountLoginSuccessService, LocaleResolver localeResolver) { + public LoginSuccessHandler( + UserAccountLoginSuccessService userAccountLoginSuccessService, + LocaleResolver localeResolver + ) { super(); this.userAccountLoginSuccessService = userAccountLoginSuccessService; this.localeResolver = localeResolver; diff --git a/src/main/java/org/woehlke/simpleworklist/user/login/UserLoginController.java b/src/main/java/org/woehlke/simpleworklist/user/login/UserLoginController.java index e730c492..a0e52ca2 100644 --- a/src/main/java/org/woehlke/simpleworklist/user/login/UserLoginController.java +++ b/src/main/java/org/woehlke/simpleworklist/user/login/UserLoginController.java @@ -28,7 +28,10 @@ public class UserLoginController { private final UserAccountAccessService userAccountAccessService; @Autowired - public UserLoginController(UserAccountLoginSuccessService userAccountLoginSuccessService, UserAccountAccessService userAccountAccessService) { + public UserLoginController( + UserAccountLoginSuccessService userAccountLoginSuccessService, + UserAccountAccessService userAccountAccessService + ) { this.userAccountLoginSuccessService = userAccountLoginSuccessService; this.userAccountAccessService = userAccountAccessService; } @@ -41,7 +44,7 @@ public UserLoginController(UserAccountLoginSuccessService userAccountLoginSucces * @return Login Screen. */ @RequestMapping(path = "/login", method = RequestMethod.GET) - public final String loginForm(Model model) { + public final String loginGet(Model model) { log.info("loginForm"); LoginForm loginForm = new LoginForm(); model.addAttribute("loginForm", loginForm); @@ -57,7 +60,7 @@ public final String loginForm(Model model) { * @return Shows Root Project after successful login or login form with error messages. */ @RequestMapping(path = "/login", method = RequestMethod.POST) - public final String loginPerform( + public final String loginPost( @Valid LoginForm loginForm, BindingResult result, Model model @@ -68,13 +71,16 @@ public final String loginPerform( UserAccount user = userAccountLoginSuccessService.retrieveCurrentUser(); userAccountLoginSuccessService.updateLastLoginTimestamp(user); log.info("logged in"); - return "redirect:/"; + return "redirect:/home"; } else { String objectName = "loginForm"; String field = "userEmail"; String defaultMessage = "Email or Password wrong."; - FieldError e = new FieldError(objectName, field, defaultMessage); - result.addError(e); + FieldError fieldError = new FieldError(objectName, field, defaultMessage); + result.addError(fieldError); + field = "userPassword"; + fieldError = new FieldError(objectName, field, defaultMessage); + result.addError(fieldError); log.info("not logged in"); return "user/login/loginForm"; } @@ -92,6 +98,6 @@ public String logoutPage ( new SecurityContextLogoutHandler().logout(request, response, auth); } status.setComplete(); - return "redirect:/"; + return "redirect:/home"; } } diff --git a/src/main/java/org/woehlke/simpleworklist/user/register/UserRegistration.java b/src/main/java/org/woehlke/simpleworklist/user/register/UserRegistration.java index 52c261cb..83043b98 100644 --- a/src/main/java/org/woehlke/simpleworklist/user/register/UserRegistration.java +++ b/src/main/java/org/woehlke/simpleworklist/user/register/UserRegistration.java @@ -2,7 +2,7 @@ import javax.validation.constraints.Email; -import org.woehlke.simpleworklist.common.AuditModel; +import org.woehlke.simpleworklist.application.common.AuditModel; import javax.persistence.*; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationServiceImpl.java index 3184df87..863b46ca 100644 --- a/src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationServiceImpl.java +++ b/src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationServiceImpl.java @@ -6,8 +6,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.mail.MailException; import org.springframework.mail.SimpleMailMessage; import org.springframework.mail.javamail.JavaMailSender; @@ -15,7 +13,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import org.woehlke.simpleworklist.config.ApplicationProperties; +import org.woehlke.simpleworklist.application.ApplicationProperties; import org.woehlke.simpleworklist.user.token.TokenGeneratorService; @Slf4j diff --git a/src/main/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecovery.java b/src/main/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecovery.java index d3f00b08..eb0ac5d4 100644 --- a/src/main/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecovery.java +++ b/src/main/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecovery.java @@ -2,7 +2,7 @@ import javax.validation.constraints.Email; -import org.woehlke.simpleworklist.common.AuditModel; +import org.woehlke.simpleworklist.application.common.AuditModel; import javax.persistence.*; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryServiceImpl.java index 4f9e475f..a8a38964 100644 --- a/src/main/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryServiceImpl.java +++ b/src/main/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryServiceImpl.java @@ -1,8 +1,6 @@ package org.woehlke.simpleworklist.user.resetpassword; import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.mail.MailException; import org.springframework.mail.SimpleMailMessage; @@ -11,7 +9,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import org.woehlke.simpleworklist.config.ApplicationProperties; +import org.woehlke.simpleworklist.application.ApplicationProperties; import org.woehlke.simpleworklist.user.token.TokenGeneratorService; import java.util.Date; diff --git a/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserChangeNameForm.java b/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserChangeNameForm.java index 39a9ce95..5936cca7 100644 --- a/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserChangeNameForm.java +++ b/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserChangeNameForm.java @@ -3,7 +3,7 @@ import javax.validation.constraints.NotBlank; import lombok.*; -import org.hibernate.validator.constraints.SafeHtml; +//import org.hibernate.validator.constraints.SafeHtml; import javax.validation.constraints.NotNull; import java.io.Serializable; @@ -22,7 +22,7 @@ public class UserChangeNameForm implements Serializable { private static final long serialVersionUID = 5120488382888268418L; //TODO: Messages i18n - @SafeHtml(whitelistType= SafeHtml.WhiteListType.NONE) + //@SafeHtml(whitelistType= SafeHtml.WhiteListType.NONE) @NotNull(message = "Fullname is compulsory") @NotBlank(message = "Fullname is compulsory") private String userFullname; diff --git a/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserChangePasswordForm.java b/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserChangePasswordForm.java index 39ecdfd1..42ffe301 100644 --- a/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserChangePasswordForm.java +++ b/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserChangePasswordForm.java @@ -3,7 +3,7 @@ import javax.validation.constraints.NotBlank; import lombok.*; -import org.hibernate.validator.constraints.SafeHtml; +//import org.hibernate.validator.constraints.SafeHtml; import javax.persistence.Transient; import javax.validation.constraints.NotNull; @@ -22,19 +22,19 @@ public class UserChangePasswordForm implements Serializable { private static final long serialVersionUID = 9149342594823222054L; //TODO: Messages i18n - @SafeHtml(whitelistType= SafeHtml.WhiteListType.NONE) + //@SafeHtml(whitelistType= SafeHtml.WhiteListType.NONE) @NotNull(message = "Password is compulsory") @NotBlank(message = "Password is compulsory") private String oldUserPassword; //TODO: Messages i18n - @SafeHtml(whitelistType= SafeHtml.WhiteListType.NONE) + //@SafeHtml(whitelistType= SafeHtml.WhiteListType.NONE) @NotNull(message = "Password is compulsory") @NotBlank(message = "Password is compulsory") private String userPassword; //TODO: Messages i18n - @SafeHtml(whitelistType= SafeHtml.WhiteListType.NONE) + //@SafeHtml(whitelistType= SafeHtml.WhiteListType.NONE) @NotNull(message = "Password is compulsory") @NotBlank(message = "Password is compulsory") private String userPasswordConfirmation; diff --git a/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceController.java b/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceController.java index 9d9fd0c4..c6039be6 100644 --- a/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceController.java +++ b/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceController.java @@ -15,16 +15,16 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.woehlke.simpleworklist.breadcrumb.Breadcrumb; -import org.woehlke.simpleworklist.common.AbstractController; +import org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb; +import org.woehlke.simpleworklist.application.common.AbstractController; import org.woehlke.simpleworklist.context.NewContextForm; import org.woehlke.simpleworklist.context.UserChangeDefaultContextForm; -import org.woehlke.simpleworklist.language.UserChangeLanguageForm; +import org.woehlke.simpleworklist.application.language.UserChangeLanguageForm; import org.woehlke.simpleworklist.context.Context; import org.woehlke.simpleworklist.user.account.UserAccount; -import org.woehlke.simpleworklist.language.Language; +import org.woehlke.simpleworklist.application.language.Language; import org.woehlke.simpleworklist.user.account.UserAccountAccessService; -import org.woehlke.simpleworklist.session.UserSessionBean; +import org.woehlke.simpleworklist.user.session.UserSessionBean; import javax.validation.Valid; import java.util.List; @@ -163,7 +163,9 @@ public String userPasswordStore( } return "user/selfservice/password"; } - if(!userAccountAccessService.confirmUserByLoginAndPassword(user.getUserEmail(), userChangePasswordForm.getOldUserPassword())){ + if(!userAccountAccessService.confirmUserByLoginAndPassword( + user.getUserEmail(), userChangePasswordForm.getOldUserPassword()) + ){ log.info("old Password is wrong"); String objectName = "userChangePasswordForm"; String field = "oldUserPassword"; @@ -182,12 +184,12 @@ public String userPasswordStore( } @RequestMapping(path = "/contexts", method = RequestMethod.GET) - public String userAreasForm( + public String userContextsForm( @ModelAttribute("userSession") UserSessionBean userSession, @ModelAttribute("locale") Locale locale, Model model ){ - log.info("userAreasForm"); + log.info("userContextsForm"); Context context = super.getContext(userSession); UserAccount user = context.getUserAccount(); UserChangeDefaultContextForm bean = new UserChangeDefaultContextForm(); @@ -202,14 +204,14 @@ public String userAreasForm( } @RequestMapping(path = "/contexts", method = RequestMethod.POST) - public String userAreasSave( + public String userContextsSave( @Valid @ModelAttribute("thisUser") UserChangeDefaultContextForm thisUser, BindingResult result, @ModelAttribute("userSession") UserSessionBean userSession, @ModelAttribute("locale") Locale locale, Model model ){ - log.info("userAreasSave"); + log.info("userContextsSave"); Context context = super.getContext(userSession); UserAccount user = context.getUserAccount(); List contexts = contextService.getAllForUser(user); @@ -217,7 +219,7 @@ public String userAreasSave( Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForUserContexts(locale); model.addAttribute("breadcrumb", breadcrumb); if(result.hasErrors()){ - log.info("userAreasSave: result has Errors"); + log.info("userContextsSave: result has Errors"); for(ObjectError error : result.getAllErrors()){ log.info(error.toString()); } @@ -226,19 +228,20 @@ public String userAreasSave( if(user.getId() == thisUser.getId()){ user.setDefaultContext(thisUser.getDefaultContext()); userAccountService.saveAndFlush(user); - model.addAttribute("userSession",new UserSessionBean(thisUser.getDefaultContext().getId())); + userSession.setLastContextId(thisUser.getDefaultContext().getId()); + model.addAttribute("userSession", userSession); } return "redirect:/user/selfservice/contexts"; } } @RequestMapping(path = "/context/add", method = RequestMethod.GET) - public String userNewAreaForm( + public String userNewContextGet( @ModelAttribute("userSession") UserSessionBean userSession, @ModelAttribute("locale") Locale locale, Model model ){ - log.info("userNewAreaForm"); + log.info("userNewContextGet"); Context context = super.getContext(userSession); UserAccount user = context.getUserAccount(); model.addAttribute("thisUser", user); @@ -250,14 +253,14 @@ public String userNewAreaForm( } @RequestMapping(path = "/context/add", method = RequestMethod.POST) - public String userNewAreaStore( + public String userNewContextPost( @Valid NewContextForm newContext, BindingResult result, @ModelAttribute("userSession") UserSessionBean userSession, @ModelAttribute("locale") Locale locale, Model model ){ - log.info("userNewAreaStore"); + log.info("userNewContextPost"); Context context = super.getContext(userSession); UserAccount user = context.getUserAccount(); Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForUserContextAdd(locale); @@ -276,13 +279,13 @@ public String userNewAreaStore( } @RequestMapping(path = "/context/{id}/edit", method = RequestMethod.GET) - public String userEditAreaForm( + public String userContextEditGet( @PathVariable("id") Context context, @ModelAttribute("userSession") UserSessionBean userSession, @ModelAttribute("locale") Locale locale, Model model ){ - log.info("userEditAreaForm"); + log.info("userContextEditGet"); Context contextFromSession = super.getContext(userSession); UserAccount user = contextFromSession.getUserAccount(); model.addAttribute("thisUser", user); @@ -296,7 +299,7 @@ public String userEditAreaForm( } @RequestMapping(path = "/context/{id}/edit", method = RequestMethod.POST) - public String userEditAreaStore( + public String userContextEditPost( @Valid NewContextForm editContext, @PathVariable("id") Context context, BindingResult result, @@ -304,11 +307,11 @@ public String userEditAreaStore( @ModelAttribute("locale") Locale locale, Model model ){ - log.info("userEditAreaStore"); + log.info("userContextEditPost"); Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForUserContextEdit(locale, context); model.addAttribute("breadcrumb", breadcrumb); if(result.hasErrors()){ - log.info("userEditAreaStore: result has Errors"); + log.info("userContextEditPost: result has Errors"); for(ObjectError error : result.getAllErrors()){ log.info(error.toString()); } @@ -324,13 +327,13 @@ public String userEditAreaStore( //TODO: is in session active? -> display message in frontend //TODO: has projects or tasks? -> display message in frontend @RequestMapping(path = "/context/{id}/delete", method = RequestMethod.GET) - public String userDeleteArea( + public String userDeleteContextGet( @PathVariable("id") Context context, @ModelAttribute("userSession") UserSessionBean userSession, @ModelAttribute("locale") Locale locale, Model model ){ - log.info("userDeleteArea"); + log.info("userDeleteContextGet"); UserAccount thisUser = context.getUserAccount(); model.addAttribute("userSession",userSession); model.addAttribute("thisUser", thisUser); @@ -356,12 +359,12 @@ public String userDeleteArea( } @RequestMapping(path = "/language", method = RequestMethod.GET) - public String userLanguageForm( + public String userLanguageGet( @ModelAttribute("userSession") UserSessionBean userSession, @ModelAttribute("locale") Locale locale, Model model ){ - log.info("userLanguageForm"); + log.info("userLanguageGet"); UserAccount user = userAccountLoginSuccessService.retrieveCurrentUser(); model.addAttribute("thisUser", user); model.addAttribute("languages", Language.list()); @@ -372,19 +375,19 @@ public String userLanguageForm( } @RequestMapping(path = "/language", method = RequestMethod.POST) - public String userLanguageStore( + public String userLanguagePost( @Valid UserChangeLanguageForm userChangeLanguageForm, BindingResult result, @ModelAttribute("userSession") UserSessionBean userSession, @ModelAttribute("locale") Locale locale, Model model ){ - log.info("userLanguageStore"); + log.info("userLanguagePost"); UserAccount user = userAccountLoginSuccessService.retrieveCurrentUser(); Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForUserChangeLanguage(locale); model.addAttribute("breadcrumb", breadcrumb); if(result.hasErrors()){ - log.info("userLanguageStore: result has Errors"); + log.info("userLanguagePost: result has Errors"); for(ObjectError error : result.getAllErrors()){ log.info(error.toString()); } diff --git a/src/main/java/org/woehlke/simpleworklist/session/UserSessionBean.java b/src/main/java/org/woehlke/simpleworklist/user/session/UserSessionBean.java similarity index 95% rename from src/main/java/org/woehlke/simpleworklist/session/UserSessionBean.java rename to src/main/java/org/woehlke/simpleworklist/user/session/UserSessionBean.java index 5ffd685c..a9b9fdf9 100644 --- a/src/main/java/org/woehlke/simpleworklist/session/UserSessionBean.java +++ b/src/main/java/org/woehlke/simpleworklist/user/session/UserSessionBean.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.session; +package org.woehlke.simpleworklist.user.session; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index acbea186..e47486af 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -2,10 +2,10 @@ - + - + diff --git a/src/main/resources/messages_de.properties b/src/main/resources/messages_de.properties index 2647511e..e4bb96ce 100644 --- a/src/main/resources/messages_de.properties +++ b/src/main/resources/messages_de.properties @@ -49,8 +49,8 @@ pages.users.lastLogin=Letzte Anmeldung pages.users.dateOfRegistration=Datum der Registrierung pages.user.profile=User Selfservice pages.user.profile.change.name=Namen ändern -pages.user.profile.change.password=Password ändern -pages.user.profile.change.contexts=Kontexte ändern +pages.user.profile.change.password=Password ändern +pages.user.profile.change.contexts=Kontexte ändern pages.user.profile.add.context=Weiteren Kontext hinzufügen pages.user.profile.edit.context=Kontext ändern pages.user.profile.delete.context=Kontext löschen @@ -65,24 +65,24 @@ pages.user2UserMessages.showAllText2=(hier werden nur die letzten 20 Angezeigt) project.add.h1=Neues Projekt project.add.description=Beschreibung project.add.button=Neues Projekt speichern -project.edit.h1=Projekt ändern +project.edit.h1=Projekt ändern project.edit.description=Beschreibung project.edit.button=Projekt speichern project.show.h1=Projekt project.show.description=Beschreibung -project.show.edit=Projekt ändern -project.show.delete=Projekt löschen +project.show.edit=Projekt ändern +project.show.delete=Projekt löschen project.show.addTask=Neue Aufgabe project.show.title=Aufgabe project.show.text=Text -project.show.dueDate=Fälligkeitsdatum +project.show.dueDate=Fälligkeitsdatum project.show.taskState=Status project.show.state.inbox=Eingang project.show.state.today=Heute -project.show.state.next=als Nächstes +project.show.state.next=als Nächstes project.show.state.waiting=Warten project.show.state.scheduled=Eingeplant -project.show.state.someday=Später +project.show.state.someday=Später project.show.state.completed=Erledigte Aufgaben project.show.state.trash=Papierkorb project.show.nothingToDo=Es gibt keine Aufgaben in diesem Projekt. @@ -94,10 +94,10 @@ layout.page.showUsers=Benutzer layout.page.logout=Abmelden layout.page.inbox=Eingang layout.page.today=Heute -layout.page.next=Als Nächstes +layout.page.next=Als Nächstes layout.page.waiting=Warten layout.page.scheduled=Eingeplant -layout.page.someday=Später +layout.page.someday=Sääter layout.page.focus=Fokus layout.page.completed=Erledigt layout.page.trash=Papierkorb @@ -107,15 +107,15 @@ searchRequest.resultlist.h2.noTasks=Keine Aufgaben gefunden searchRequest.resultlist.h2.tasks=Aufgaben searchRequest.resultlist.tasks.title=Aufgabe searchRequest.resultlist.tasks.text=Text -searchRequest.resultlist.tasks.dueDate=Fälligkeitsdatum +searchRequest.resultlist.tasks.dueDate=Fälligkeitsdatum searchRequest.resultlist.tasks.state=Status searchRequest.resultlist.tasks.project=Projekt searchRequest.resultlist.tasks.inbox=Eingang searchRequest.resultlist.tasks.today=Heute -searchRequest.resultlist.tasks.next=Als Nächstes +searchRequest.resultlist.tasks.next=Als Nächstes searchRequest.resultlist.tasks.waiting=Warten searchRequest.resultlist.tasks.scheduled=Eingeplant -searchRequest.resultlist.tasks.someday=Später +searchRequest.resultlist.tasks.someday=Später searchRequest.resultlist.tasks.completed=Erledigte Aufgaben searchRequest.resultlist.tasks.trash=Papierkorb searchRequest.resultlist.projects.h2.noProjects=Keine Projekte gefunden @@ -124,23 +124,23 @@ searchRequest.resultlist.projects.name=Name searchRequest.resultlist.projects.description=Beschreibung task.add.h1=Neue Aufgabe task.add.title=Aufgabe -task.add.dueDate=Fälligkeitsdatum +task.add.dueDate=Fälligkeitsdatum task.add.text=Text task.add.taskEnergy=Energie task.add.taskTime=Zeit task.add.button=Neue Aufgabe speichern layout.page.signedInUser=Angemeldet als task.show.title=Aufgabe -task.show.dueDate=Fälligkeitsdatum +task.show.dueDate=Fälligkeitsdatum task.show.text=Beschreibung task.show.taskEnergy=Energie task.show.taskTime=Zeit task.show.button=Aufgabe speichern task.show.transform=Wandle um in ein Projekt -task.show.button.edit= Aufgabe berarbeiten +task.show.button.edit= Aufgabe bearbeiten task.show.button.close=zurück right.nav.projects=Projekte -task.show.h1=Aufgaben ändern +task.show.h1=Aufgaben ändern tasks.completed.h1=Erledigte Aufgaben tasks.completed.delete=Lösche alle erledigten Aufgaben tasks.completed.title=Aufgabe @@ -150,7 +150,7 @@ tasks.completed.noTasks=Sie haben keine erledigten Aufgaben tasks.focus.h1=Fokus tasks.focus.title=Aufgabe tasks.focus.text=Text -tasks.focus.dueDate=Fälligkeitsdatum +tasks.focus.dueDate=Fälligkeitsdatum tasks.focus.taskState=Status tasks.focus.project=Projekt tasks.focus.noTasks=Sie haben keine Aufgaben im Fokus @@ -163,18 +163,18 @@ tasks.next.h1=Als Nächstes tasks.next.title=Aufgabe tasks.next.text=Text tasks.next.project=Projekt -tasks.next.noTasks=Sie haben keine Aufgaben als Nächstes +tasks.next.noTasks=Sie haben keine Aufgaben als Nächstes tasks.scheduled.h1=Eingeplant tasks.scheduled.title=Aufgabe tasks.scheduled.text=Text -tasks.scheduled.dueDate=Fälligkeitsdatum +tasks.scheduled.dueDate=Fälligkeitsdatum tasks.scheduled.project=Projekt tasks.scheduled.noTasks=Sie haben keine eingeplanten Aufgaben tasks.someday.h1=Später tasks.someday.title=Aufgabe tasks.someday.text=Text tasks.someday.project=Projekt -tasks.someday.noTasks=Sie haben keine Aufgaben für später +tasks.someday.noTasks=Sie haben keine Aufgaben für später tasks.today.h1=Heute tasks.today.title=Aufgabe tasks.today.text=Text @@ -220,35 +220,35 @@ enum.tasktime.none=keine layout.page.contexts=Kontext user.selfservice.profile.h1=Benutzer Profil user.selfservice.profile.userEmail=Benutzer Email\: -user.selfservice.profile.name=Name �ndern\: -user.selfservice.profile.changePassword=Passwort �ndern -user.selfservice.profile.changeContexts=Kontexte �ndern +user.selfservice.profile.name=Name ändern\: +user.selfservice.profile.changePassword=Passwort ändern +user.selfservice.profile.changeContexts=Kontexte ändern user.selfservice.profile.changeLanguage=Sprache einstellen -button.back= zur�ck +button.back= zurück user.selfservice.name.button=Benutzernamen speichern user.resetPasswordConfirmed.oldUserPassword=Bestehendes Passwort user.selfservice.language.button=Setze Sprache enum.language.de=Deutsch enum.language.en=Englisch user.selfservice.language.defaultLanguage=Sprache -user.selfservice.forUser=f�r Benutzer\: -user.selfservice.contexts.add.button=Neuen Kontext hinzuf�gen -user.selfservice.contexts.edit=Kontext �ndern +user.selfservice.forUser=für Benutzer\: +user.selfservice.contexts.add.button=Neuen Kontext hinzufügen +user.selfservice.contexts.edit=Kontext Ändern user.selfservice.contexts.edit.button=Kontext speichern user.selfservice.context.default=Setze voreingestellten Kontext user.selfservice.context.default.button=Voreingestellten Kontext speichern -task.show.context=Kontext Ändern +task.show.context=Kontext Ändern project.edit.context=Kontext tasks.all.h1=Alle Aufgaben tasks.all.noTasks=Sie haben keine Aufgaben tasks.all.context=Kontext -task.col.twtooltip.infoicons.finish.task=Hier k�nnen Sie die Aufgabe als erledigt markieren -task.col.twtooltip.infoicons.unfinish.task=Hier k�nnen Sie die Aufgabe als doch noch unerledigt markieren +task.col.twtooltip.infoicons.finish.task=Hier können Sie die Aufgabe als erledigt markieren +task.col.twtooltip.infoicons.unfinish.task=Hier können Sie die Aufgabe als doch noch unerledigt markieren task.col.twtooltip.infoicons.trash=TODO -task.col.twtooltip.infoicons.unsetfocus=Hier k�nnen Sie die Aufgabe aus dem Fokus nehmen -task.col.twtooltip.infoicons.setfocus=Hier k�nnen Sie die Aufgabe in den Fokus nehmen -task.col.twtooltip.show.details=Hier k�nnen Sie sich alle Informationen zu dieser Aufgabe anzeigen lassen -task.col.twtooltip.duedate=F�lligkeitsdatum +task.col.twtooltip.infoicons.unsetfocus=Hier können Sie die Aufgabe aus dem Fokus nehmen +task.col.twtooltip.infoicons.setfocus=Hier können Sie die Aufgabe in den Fokus nehmen +task.col.twtooltip.show.details=Hier können Sie sich alle Informationen zu dieser Aufgabe anzeigen lassen +task.col.twtooltip.duedate=Fälligkeitsdatum task.col.twtooltip.taskstate=Status task.col.twtooltip.project=Projekt task.col.twtooltip.badge.taskEnergy=Energie Aufwand @@ -262,3 +262,7 @@ tasks.col.project=Projekt tasks.col.projectroot=Wurzel tasks.col.energyandtime=  tasks.col.context=Kontext +user.loginForm.email.label=Email +user.loginForm.email.placeholder=Geben Sie Ihre Emailadresse ein +user.loginForm.password.label=Passwort +user.loginForm.password.placeholder=Geben Sie Ihr Passwort ein diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties index a469bf68..ce7cf555 100644 --- a/src/main/resources/messages_en.properties +++ b/src/main/resources/messages_en.properties @@ -262,3 +262,8 @@ tasks.col.project=Project tasks.col.projectroot=Wurzel tasks.col.energyandtime=  tasks.col.context=Context +user.loginForm.email.label=Email +user.loginForm.email.placeholder=Enter your Email +user.loginForm.password.label=Password +user.loginForm.password.placeholder=Enter your Password + diff --git a/src/main/resources/templates/layout/project.html b/src/main/resources/templates/layout/project.html new file mode 100644 index 00000000..320b4751 --- /dev/null +++ b/src/main/resources/templates/layout/project.html @@ -0,0 +1,60 @@ + + + +
+ + + + +
+
+
+ + +
+
err
+
+
+
+
+
+
+
+ + +
+
err
+
+
+
+
+
+
+
+ + +
+
err
+
+
+
+
+
+ + diff --git a/src/main/resources/templates/layout/task.html b/src/main/resources/templates/layout/task.html new file mode 100644 index 00000000..f8ec8718 --- /dev/null +++ b/src/main/resources/templates/layout/task.html @@ -0,0 +1,128 @@ + + + +
+ + + + + +
+
+
+ + +
+
err
+
+
+
+
+
+
+
+ + +
+
err
+
+
+
+
+
+ + +
+
err
+
+
+
+
+
+
+
+ + +
+
err
+
+
+
+
+
+
+
+ + +
+
err
+
+
+
+
+
+ + +
+
err
+
+
  +
+
+
+ + +
+
err
+
+
+
+
+
+ + diff --git a/src/main/resources/templates/layout/taskadd.html b/src/main/resources/templates/layout/taskadd.html new file mode 100644 index 00000000..774f34d8 --- /dev/null +++ b/src/main/resources/templates/layout/taskadd.html @@ -0,0 +1,128 @@ + + + +
+ + + + + +
+
+
+ + +
+
err
+
+
+
+
+
+
+
+ + +
+
err
+
+
+
+
+
+ + +
+
err
+
+
+
+
+
+
+
+ + +
+
err
+
+
+
+
+
+
+
+ + +
+
err
+
+
+
+
+
+ + +
+
err
+
+
  +
+
+
+ + +
+
err
+
+
+
+
+
+ + diff --git a/src/main/resources/templates/layout/tasks.html b/src/main/resources/templates/layout/tasks.html index 41873e10..89c34168 100644 --- a/src/main/resources/templates/layout/tasks.html +++ b/src/main/resources/templates/layout/tasks.html @@ -13,15 +13,14 @@ - -
+
-
+
-
+
@@ -56,13 +55,13 @@ draggable="true" ondragstart="dragTask(event)" ondrop="dropTask2Task(event)" ondragover="allowDropOfTask(event)"> - - - - - - - - - \ No newline at end of file + + + + Title + + + +
+

+ + Add Area + + for User: + + + + +

+
+ +
+
+
+
+ + + + + + + + + diff --git a/src/main/resources/templates/user/selfservice/context/all.html b/src/main/resources/templates/user/selfservice/context/all.html index ad1312e9..aafa8f26 100644 --- a/src/main/resources/templates/user/selfservice/context/all.html +++ b/src/main/resources/templates/user/selfservice/context/all.html @@ -1,97 +1,97 @@ - - - - Title - - - -
-

- - Change Areas - - for User: - - - - -

-
- -
- - @@ -72,13 +71,13 @@ th:if="${task.taskState.name() eq 'TRASHED'}" th:alt-title="#{task.col.twtooltip.infoicons.trash}" draggable="true" ondragstart="dragTask(event)" data-placement="bottom"> - - @@ -86,7 +85,7 @@ -
+
@@ -161,7 +160,7 @@ -
+
- task.show.button.edit diff --git a/src/main/resources/templates/project/id/edit.html b/src/main/resources/templates/project/id/edit.html index ecfc2dd3..d570ff28 100644 --- a/src/main/resources/templates/project/id/edit.html +++ b/src/main/resources/templates/project/id/edit.html @@ -20,7 +20,7 @@

-
+
@@ -28,7 +28,7 @@

-
+
@@ -39,9 +39,9 @@

-
+
-
-
-
-
-
- - -
-
-
-
-
- - -
-
-
-
- - - -
- - +
+
+
+
+ +
+
+
- + diff --git a/src/main/resources/templates/project/id/show.html b/src/main/resources/templates/project/id/show.html index 45f39947..1c3ee770 100644 --- a/src/main/resources/templates/project/id/show.html +++ b/src/main/resources/templates/project/id/show.html @@ -19,30 +19,44 @@

- - - - Edit Project - - - - Delete Project - s - - - Add a Project - - - - Add a Task - +
+
+ + + Add a Task + +
+
+ + + Add a Project + +
+
+ + + Edit Project + +
+
+ + + Delete Project + +
+
+
+
+ +
+
@@ -55,8 +69,7 @@

- -
+
diff --git a/src/main/resources/templates/project/id/task/add.html b/src/main/resources/templates/project/id/task/add.html index faa68b30..19c1dc51 100644 --- a/src/main/resources/templates/project/id/task/add.html +++ b/src/main/resources/templates/project/id/task/add.html @@ -18,95 +18,21 @@

-
- - - -
- - -
-
-
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
-
-
- - - -
-
-
-
-   - - - -
-
-
-
-   - - - -
-
-
-
- -
- - + +
+
+
+ +
+
- + diff --git a/src/main/resources/templates/project/id/task/edit.html b/src/main/resources/templates/project/id/task/edit.html index bf693db2..0ee7536e 100644 --- a/src/main/resources/templates/project/id/task/edit.html +++ b/src/main/resources/templates/project/id/task/edit.html @@ -19,109 +19,24 @@

-
- - - -
- - -
-
-
-
-
- - - -
-
-
+ +
+
+
+
- -
- - -
-
-
-
-
-
- - -
-
-
-
-
-
- - - -
-
-
-
-   - - - -
-
-
-
-   - - - -
-
-
-
- -
- - - - - Transform into Project - +
+ + + Transform into Project + +
+
diff --git a/src/main/resources/templates/project/root/project/add.html b/src/main/resources/templates/project/root/project/add.html index ad3c9bb4..12e15db4 100644 --- a/src/main/resources/templates/project/root/project/add.html +++ b/src/main/resources/templates/project/root/project/add.html @@ -18,51 +18,21 @@

-
-
-
- - -
-
-
-
-
- - -
-
-
-
-
- - -
-
-
-
- - -
-
- - +
+
+
+
+ +
+
+
- + diff --git a/src/main/resources/templates/project/root/show.html b/src/main/resources/templates/project/root/show.html index 823a5925..be85f9e6 100644 --- a/src/main/resources/templates/project/root/show.html +++ b/src/main/resources/templates/project/root/show.html @@ -15,15 +15,19 @@

Project

-
- - - Add a Project - - - - Add a Task - +
+
+ + + Add a Task + +
+
+ + + Add a Project + +
@@ -33,8 +37,7 @@

- -
+
diff --git a/src/main/resources/templates/project/root/task/add.html b/src/main/resources/templates/project/root/task/add.html index 98df2d16..0a7d3208 100644 --- a/src/main/resources/templates/project/root/task/add.html +++ b/src/main/resources/templates/project/root/task/add.html @@ -18,95 +18,21 @@

-
- - - -
- - -
-
-
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
-
-
- - - -
-
-
-
-   - - - -
-
-
-
-   - - - -
-
-
-
- -
- - + +
+
+
+ +
+
- + diff --git a/src/main/resources/templates/project/root/task/edit.html b/src/main/resources/templates/project/root/task/edit.html index bf693db2..258b1057 100644 --- a/src/main/resources/templates/project/root/task/edit.html +++ b/src/main/resources/templates/project/root/task/edit.html @@ -11,117 +11,31 @@
-

+

  Edit Task

-
-
- - - -
- - -
-
-
-
-
- - - -
-
-
+
+ +
+
+
+
- -
- - -
-
-
-
-
-
- - -
-
-
-
-
-
- - - -
-
-
-
-   - - - -
-
-
-
-   - - - -
-
-
-
- -
- - - - - Transform into Project - +
+ + + Transform into Project + +
+
diff --git a/src/main/resources/templates/taskstate/completed.html b/src/main/resources/templates/taskstate/completed.html index 21be8716..1ddc5ab6 100644 --- a/src/main/resources/templates/taskstate/completed.html +++ b/src/main/resources/templates/taskstate/completed.html @@ -1,41 +1,46 @@ - - - - Title - - - -
-
-

- - Completed Tasks -

-
- - - Delete All Completed Tasks - -
-
-
- -
-
-
-
-
-
-
-
-

You have no completed Tasks

-
-
- - - - \ No newline at end of file + + + + Title + + + +
+
+
+

+ + Completed Tasks +

+
+
+
+ + + Delete All Completed Tasks + +
+
+
+
+ +
+
+
+
+
+
+
+
+

You have no completed Tasks

+
+
+ + + diff --git a/src/main/resources/templates/taskstate/focus.html b/src/main/resources/templates/taskstate/focus.html index 05fc605b..b452d0f1 100644 --- a/src/main/resources/templates/taskstate/focus.html +++ b/src/main/resources/templates/taskstate/focus.html @@ -1,35 +1,35 @@ - - - - Title - - - -
-
-

- - Focus -

-
-
- -
-
-
-
-
-
-
-
-

You have no Tasks in Focus

-
-
- - - - \ No newline at end of file + + + + Title + + + +
+
+

+ + Focus +

+
+
+ +
+
+
+
+
+
+
+
+

You have no Tasks in Focus

+
+
+ + + + diff --git a/src/main/resources/templates/taskstate/inbox.html b/src/main/resources/templates/taskstate/inbox.html index 3dc2fb22..363ec864 100644 --- a/src/main/resources/templates/taskstate/inbox.html +++ b/src/main/resources/templates/taskstate/inbox.html @@ -11,15 +11,19 @@
-

- - Inbox -

-
- - - Add Task - +
+

+ + Inbox +

+
+
+
+ + + Add Task + +
@@ -28,7 +32,7 @@

-
+
diff --git a/src/main/resources/templates/taskstate/next.html b/src/main/resources/templates/taskstate/next.html index 26cea899..9a8b14d4 100644 --- a/src/main/resources/templates/taskstate/next.html +++ b/src/main/resources/templates/taskstate/next.html @@ -1,35 +1,35 @@ - - - - Title - - - -
-
-

- - Next -

-
-
- -
-
-
-
-
-
-
-
-

You have no Tasks to do Next

-
-
- - - - \ No newline at end of file + + + + Title + + + +
+
+

+ + Next +

+
+
+ +
+
+
+
+
+
+
+
+

You have no Tasks to do Next

+
+
+ + + + diff --git a/src/main/resources/templates/taskstate/scheduled.html b/src/main/resources/templates/taskstate/scheduled.html index 9ef73cb9..0dfecc66 100644 --- a/src/main/resources/templates/taskstate/scheduled.html +++ b/src/main/resources/templates/taskstate/scheduled.html @@ -1,34 +1,34 @@ - - - - Title - - - -
-
-

- - Scheduled -

-
-
- -
-
-
-
-
-
-
-
-

You have no scheduled Tasks

-
-
- - - \ No newline at end of file + + + + Title + + + +
+
+

+ + Scheduled +

+
+
+ +
+
+
+
+
+
+
+
+

You have no scheduled Tasks

+
+
+ + + diff --git a/src/main/resources/templates/taskstate/someday.html b/src/main/resources/templates/taskstate/someday.html index 57d21a6e..d4b494b0 100644 --- a/src/main/resources/templates/taskstate/someday.html +++ b/src/main/resources/templates/taskstate/someday.html @@ -1,35 +1,35 @@ - - - - Title - - - -
-
-

- - Someday -

-
-
- -
-
-
-
-
-
-
-
-

You have no Tasks for Someday

-
-
- - - - \ No newline at end of file + + + + Title + + + +
+
+

+ + Someday +

+
+
+ +
+
+
+
+
+
+
+
+

You have no Tasks for Someday

+
+
+ + + + diff --git a/src/main/resources/templates/taskstate/task/add.html b/src/main/resources/templates/taskstate/task/add.html index fee2a40b..da2c86c5 100644 --- a/src/main/resources/templates/taskstate/task/add.html +++ b/src/main/resources/templates/taskstate/task/add.html @@ -7,7 +7,7 @@ Title - +
@@ -18,95 +18,21 @@

-
- - - -
- - -
-
-
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
-
-
- - - -
-
-
-
-   - - - -
-
-
-
-   - - - -
-
-
-
- -
- - + +
+
+
+ +
+
- + diff --git a/src/main/resources/templates/taskstate/task/edit.html b/src/main/resources/templates/taskstate/task/edit.html index de598b06..ec30ef9f 100644 --- a/src/main/resources/templates/taskstate/task/edit.html +++ b/src/main/resources/templates/taskstate/task/edit.html @@ -19,109 +19,23 @@

-
- - - -
- - -
-
-
-
-
- - - -
-
-
+ +
+
+
+
- -
- - -
-
-
-
-
-
- - -
-
-
-
-
-
- - - -
-
-
-
-   - - - -
-
-
-
-   - - - -
-
-
-
- -
- - - - - Transform into Project - +
+ + + Transform into Project + +
+
diff --git a/src/main/resources/templates/taskstate/today.html b/src/main/resources/templates/taskstate/today.html index 66333ca0..3e1b16c7 100644 --- a/src/main/resources/templates/taskstate/today.html +++ b/src/main/resources/templates/taskstate/today.html @@ -1,35 +1,35 @@ - - - - Title - - - -
-
-

- - Today -

-
-
- -
-
-
-
-
-
-
-
-

You have no Tasks for Today

-
-
- - - - \ No newline at end of file + + + + Title + + + +
+
+

+ + Today +

+
+
+ +
+
+
+
+
+
+
+
+

You have no Tasks for Today

+
+
+ + + + diff --git a/src/main/resources/templates/taskstate/trash.html b/src/main/resources/templates/taskstate/trash.html index 59efcaf3..1dadde56 100644 --- a/src/main/resources/templates/taskstate/trash.html +++ b/src/main/resources/templates/taskstate/trash.html @@ -1,41 +1,46 @@ - - - - Title - - - -
-
-

- - Trash -

-
- - - Empty Trash - -
-
-
- -
-
-
-
-
-
-
-
-

You have no deleted Tasks in your Trash

-
-
- - - - \ No newline at end of file + + + + Title + + + +
+
+
+

+ + Trash +

+
+
+
+
+ + + Empty Trash + +
+
+
+
+ +
+
+
+
+
+
+
+
+

You have no deleted Tasks in your Trash

+
+
+ + + + diff --git a/src/main/resources/templates/taskstate/waiting.html b/src/main/resources/templates/taskstate/waiting.html index daa60be5..650d068d 100644 --- a/src/main/resources/templates/taskstate/waiting.html +++ b/src/main/resources/templates/taskstate/waiting.html @@ -1,35 +1,35 @@ - - - - Title - - - -
-
-

- - Waiting -

-
-
- -
-
-
-
-
-
-
-
-

You are not waiting for others

-
-
- - - - \ No newline at end of file + + + + Title + + + +
+
+

+ + Waiting +

+
+
+ +
+
+
+
+
+
+
+
+

You are not waiting for others

+
+
+ + + + diff --git a/src/main/resources/templates/user/login/loginForm.html b/src/main/resources/templates/user/login/loginForm.html index 098a936e..6682666d 100644 --- a/src/main/resources/templates/user/login/loginForm.html +++ b/src/main/resources/templates/user/login/loginForm.html @@ -24,28 +24,52 @@

Your Todo-List for Getting Things Done .

- +
+
+ +
+
+ + + Password forgotten? + +
+
+ + + register as new user + +
diff --git a/src/main/resources/templates/user/messages/all.html b/src/main/resources/templates/user/messages/all.html index 00ec20b8..c9a7928d 100644 --- a/src/main/resources/templates/user/messages/all.html +++ b/src/main/resources/templates/user/messages/all.html @@ -38,7 +38,7 @@

-
+
@@ -46,10 +46,10 @@

th:field="*{messageText}" class="form-control" />
+ th:text="${err}" class="invalid-feedback" />
-
+
-
+
diff --git a/src/main/resources/templates/user/register/registerForm.html b/src/main/resources/templates/user/register/registerForm.html index b2fbdcd5..8b22fac0 100644 --- a/src/main/resources/templates/user/register/registerForm.html +++ b/src/main/resources/templates/user/register/registerForm.html @@ -18,7 +18,7 @@

-
+
diff --git a/src/main/resources/templates/user/resetPassword/resetPasswordConfirmed.html b/src/main/resources/templates/user/resetPassword/resetPasswordConfirmed.html index dd141821..f5a650f6 100644 --- a/src/main/resources/templates/user/resetPassword/resetPasswordConfirmed.html +++ b/src/main/resources/templates/user/resetPassword/resetPasswordConfirmed.html @@ -20,7 +20,7 @@

-
+
@@ -30,7 +30,7 @@

-
+
diff --git a/src/main/resources/templates/user/resetPassword/resetPasswordForm.html b/src/main/resources/templates/user/resetPassword/resetPasswordForm.html index b91472f4..7aad8e85 100644 --- a/src/main/resources/templates/user/resetPassword/resetPasswordForm.html +++ b/src/main/resources/templates/user/resetPassword/resetPasswordForm.html @@ -18,7 +18,7 @@

-
+
diff --git a/src/main/resources/templates/user/selfservice/context/add.html b/src/main/resources/templates/user/selfservice/context/add.html index 690813e6..a363ccbd 100644 --- a/src/main/resources/templates/user/selfservice/context/add.html +++ b/src/main/resources/templates/user/selfservice/context/add.html @@ -1,62 +1,62 @@ - - - - Title - - - -
-

- - Add Area - - for User: - - - - -

-
- -
-
- -

-
- - -
-
-
-
-
-
- - -
-
-
-
-
- -   +
+ + +
+
+
+
+
+
+ + +
+
+
+
+
+ +  
- - - - - - - - - - - - - - - - -
- Englisch - - Deutsch -   
- context.nameEn - - context.nameDe - - - - - - - - -
-
-
-
-
- - -
-
-
-
- - - -
-
- - back - - -
- - - \ No newline at end of file + + + + Title + + + +
+

+ + Change Areas + + for User: + + + + +

+
+ +
+
+ + + Add Area + +
+ + + + + + + + + + + + + + + + + +
+ Englisch + + Deutsch +   
+ context.nameEn + + context.nameDe + + + + + + + + +
+
+
+
+
+ + +
+
+
+
+ + + +
+
+ + back + + +
+ + + diff --git a/src/main/resources/templates/user/selfservice/context/edit.html b/src/main/resources/templates/user/selfservice/context/edit.html index f6ee54ca..2489aa31 100644 --- a/src/main/resources/templates/user/selfservice/context/edit.html +++ b/src/main/resources/templates/user/selfservice/context/edit.html @@ -1,62 +1,62 @@ - - - - Title - - - -
-

- - Edit Area - - for User: - - - - -

-
- -
-
-
- -
- - -
-
-
-
- - -
- - -
-
-
-
- - - - -   - -
-
- - - \ No newline at end of file + + + + Title + + + +
+

+ + Edit Area + + for User: + + + + +

+
+ +
+
+
+ +
+ + +
+
+
+
+ + +
+ + +
+
+
+
+ + + + +   + +
+
+ + + diff --git a/src/main/resources/templates/user/selfservice/language.html b/src/main/resources/templates/user/selfservice/language.html index 6c8c0b05..d96348a4 100644 --- a/src/main/resources/templates/user/selfservice/language.html +++ b/src/main/resources/templates/user/selfservice/language.html @@ -1,52 +1,52 @@ - - - - Title - - - -
-

- - Set Default Language - for User: - - - - - -

-
- -
-
-
- - -
-
-
-
-
- - - back - -
-
- - - \ No newline at end of file + + + + Title + + + +
+

+ + Set Default Language + for User: + + + + + +

+
+ +
+
+
+ + +
+
+
+
+
+ + + back + +
+
+ + + diff --git a/src/main/resources/templates/user/selfservice/name.html b/src/main/resources/templates/user/selfservice/name.html index a19ef776..2be2b117 100644 --- a/src/main/resources/templates/user/selfservice/name.html +++ b/src/main/resources/templates/user/selfservice/name.html @@ -1,51 +1,51 @@ - - - - Title - - - -
-

- - Change Name - thisUser.userFullname - - for User: - - - - -

-
- -
-
-
-
- - -
-
-
-
-
- - - back - -
-
-
- - - \ No newline at end of file + + + + Title + + + +
+

+ + Change Name + thisUser.userFullname + + for User: + + + + +

+
+ +
+
+
+
+ + +
+
+
+
+
+ + + back + +
+
+
+ + + diff --git a/src/main/resources/templates/user/selfservice/password.html b/src/main/resources/templates/user/selfservice/password.html index a2b4e36e..c369301e 100644 --- a/src/main/resources/templates/user/selfservice/password.html +++ b/src/main/resources/templates/user/selfservice/password.html @@ -1,67 +1,67 @@ - - - - Title - - - -
-

- - Change Password - - for User: - - - - -

-
- -
-
-
-
- - -
-
-
-
-
- - -
-
-
-
-
- - -
-
-
-
- - - back - - -
-
- - - \ No newline at end of file + + + + Title + + + +
+

+ + Change Password + + for User: + + + + +

+
+ +
+
+
+
+ + +
+
+
+
+
+ + +
+
+
+
+
+ + +
+
+
+
+ + + back + + +
+
+ + + diff --git a/src/test/java/org/woehlke/simpleworklist/SmokeTests.java b/src/test/java/org/woehlke/simpleworklist/SmokeTests.java index f9dc4f69..0c201989 100644 --- a/src/test/java/org/woehlke/simpleworklist/SmokeTests.java +++ b/src/test/java/org/woehlke/simpleworklist/SmokeTests.java @@ -1,12 +1,9 @@ package org.woehlke.simpleworklist; import lombok.extern.slf4j.Slf4j; -import org.junit.Before; import org.junit.jupiter.api.*; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.ImportAutoConfiguration; -import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.web.server.LocalServerPort; @@ -19,12 +16,7 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.ResultActions; import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.web.context.WebApplicationContext; -import org.woehlke.simpleworklist.config.ApplicationProperties; -import org.woehlke.simpleworklist.config.UserAccountTestDataService; -import org.woehlke.simpleworklist.config.di.WebMvcConfig; -import org.woehlke.simpleworklist.config.di.WebSecurityConfig; +import org.woehlke.simpleworklist.application.config.UserAccountTestDataService; import java.net.URL; @@ -34,7 +26,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; -import static org.woehlke.simpleworklist.config.Requirements.*; +import static org.woehlke.simpleworklist.application.config.Requirements.*; @Slf4j @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/src/test/java/org/woehlke/simpleworklist/config/AbstractTest.java b/src/test/java/org/woehlke/simpleworklist/application/config/AbstractTest.java similarity index 84% rename from src/test/java/org/woehlke/simpleworklist/config/AbstractTest.java rename to src/test/java/org/woehlke/simpleworklist/application/config/AbstractTest.java index e737d1e2..e3cea01e 100644 --- a/src/test/java/org/woehlke/simpleworklist/config/AbstractTest.java +++ b/src/test/java/org/woehlke/simpleworklist/application/config/AbstractTest.java @@ -1,20 +1,14 @@ -package org.woehlke.simpleworklist.config; +package org.woehlke.simpleworklist.application.config; -import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.BeforeEach; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.LocalServerPort; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.test.context.event.annotation.AfterTestClass; -import org.springframework.test.context.event.annotation.BeforeTestClass; import org.springframework.test.web.servlet.MockMvc; import org.springframework.web.context.WebApplicationContext; -import org.woehlke.simpleworklist.config.ApplicationProperties; -import org.woehlke.simpleworklist.helper.TestHelperService; +import org.woehlke.simpleworklist.application.ApplicationProperties; +import org.woehlke.simpleworklist.application.helper.TestHelperService; import org.woehlke.simpleworklist.user.account.UserAccount; import org.woehlke.simpleworklist.user.account.UserAccountService; import org.woehlke.simpleworklist.user.account.UserAccountAccessService; @@ -92,9 +86,9 @@ protected void makeActiveUser(String username) { } protected void deleteAll(){ - testHelperService.deleteAllRegistrationProcess(); - testHelperService.deleteAllActionItem(); - testHelperService.deleteAllCategory(); + testHelperService.deleteAllRegistrations(); + testHelperService.deleteAllTasks(); + testHelperService.deleteAllProjects(); testHelperService.deleteUserAccount(); } diff --git a/src/test/java/org/woehlke/simpleworklist/config/FunctionalRequirements.java b/src/test/java/org/woehlke/simpleworklist/application/config/FunctionalRequirements.java similarity index 95% rename from src/test/java/org/woehlke/simpleworklist/config/FunctionalRequirements.java rename to src/test/java/org/woehlke/simpleworklist/application/config/FunctionalRequirements.java index 2678a0d3..6b06ae35 100644 --- a/src/test/java/org/woehlke/simpleworklist/config/FunctionalRequirements.java +++ b/src/test/java/org/woehlke/simpleworklist/application/config/FunctionalRequirements.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.config; +package org.woehlke.simpleworklist.application.config; public enum FunctionalRequirements { diff --git a/src/test/java/org/woehlke/simpleworklist/config/Requirements.java b/src/test/java/org/woehlke/simpleworklist/application/config/Requirements.java similarity index 96% rename from src/test/java/org/woehlke/simpleworklist/config/Requirements.java rename to src/test/java/org/woehlke/simpleworklist/application/config/Requirements.java index a937490b..34c4d721 100644 --- a/src/test/java/org/woehlke/simpleworklist/config/Requirements.java +++ b/src/test/java/org/woehlke/simpleworklist/application/config/Requirements.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.config; +package org.woehlke.simpleworklist.application.config; public interface Requirements { diff --git a/src/test/java/org/woehlke/simpleworklist/config/UserAccountTestDataService.java b/src/test/java/org/woehlke/simpleworklist/application/config/UserAccountTestDataService.java similarity index 75% rename from src/test/java/org/woehlke/simpleworklist/config/UserAccountTestDataService.java rename to src/test/java/org/woehlke/simpleworklist/application/config/UserAccountTestDataService.java index 7e988b41..eec55b09 100644 --- a/src/test/java/org/woehlke/simpleworklist/config/UserAccountTestDataService.java +++ b/src/test/java/org/woehlke/simpleworklist/application/config/UserAccountTestDataService.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.config; +package org.woehlke.simpleworklist.application.config; import org.woehlke.simpleworklist.user.account.UserAccount; diff --git a/src/test/java/org/woehlke/simpleworklist/config/UserAccountTestDataServiceImpl.java b/src/test/java/org/woehlke/simpleworklist/application/config/UserAccountTestDataServiceImpl.java similarity index 94% rename from src/test/java/org/woehlke/simpleworklist/config/UserAccountTestDataServiceImpl.java rename to src/test/java/org/woehlke/simpleworklist/application/config/UserAccountTestDataServiceImpl.java index b807e8a9..32011b1c 100644 --- a/src/test/java/org/woehlke/simpleworklist/config/UserAccountTestDataServiceImpl.java +++ b/src/test/java/org/woehlke/simpleworklist/application/config/UserAccountTestDataServiceImpl.java @@ -1,13 +1,14 @@ -package org.woehlke.simpleworklist.config; +package org.woehlke.simpleworklist.application.config; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.woehlke.simpleworklist.application.ApplicationProperties; import org.woehlke.simpleworklist.context.Context; import org.woehlke.simpleworklist.context.ContextService; import org.woehlke.simpleworklist.context.NewContextForm; -import org.woehlke.simpleworklist.language.Language; +import org.woehlke.simpleworklist.application.language.Language; import org.woehlke.simpleworklist.user.account.UserAccount; import org.woehlke.simpleworklist.user.account.UserAccountService; diff --git a/src/test/java/org/woehlke/simpleworklist/application/helper/TestHelperService.java b/src/test/java/org/woehlke/simpleworklist/application/helper/TestHelperService.java new file mode 100644 index 00000000..e3ebf9cf --- /dev/null +++ b/src/test/java/org/woehlke/simpleworklist/application/helper/TestHelperService.java @@ -0,0 +1,25 @@ +package org.woehlke.simpleworklist.application.helper; + +import org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecovery; +import org.woehlke.simpleworklist.user.register.UserRegistration; + +public interface TestHelperService { + + void deleteAllRegistrations(); + + void deleteAllPasswordRecoveries(); + + void deleteAllTasks(); + + void deleteAllProjects(); + + void deleteUserAccount(); + + int getNumberOfAllRegistrations(); + + int getNumberOfAllPasswordRecoveries(); + + UserRegistration findRegistrationByEmail(String email); + + UserPasswordRecovery findPasswordRecoveryByEmail(String email); +} diff --git a/src/test/java/org/woehlke/simpleworklist/helper/TestHelperServiceImpl.java b/src/test/java/org/woehlke/simpleworklist/application/helper/TestHelperServiceImpl.java similarity index 68% rename from src/test/java/org/woehlke/simpleworklist/helper/TestHelperServiceImpl.java rename to src/test/java/org/woehlke/simpleworklist/application/helper/TestHelperServiceImpl.java index 8e329d52..2a50f285 100644 --- a/src/test/java/org/woehlke/simpleworklist/helper/TestHelperServiceImpl.java +++ b/src/test/java/org/woehlke/simpleworklist/application/helper/TestHelperServiceImpl.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.helper; +package org.woehlke.simpleworklist.application.helper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -8,13 +8,14 @@ import org.woehlke.simpleworklist.user.register.UserRegistrationRepository; import org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecovery; import org.woehlke.simpleworklist.user.register.UserRegistration; -import org.woehlke.simpleworklist.helper.TestHelperService; import org.springframework.beans.factory.annotation.Autowired; import org.woehlke.simpleworklist.task.TaskRepository; import org.woehlke.simpleworklist.user.account.UserAccountRepository; import org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecoveryRepository; +import javax.validation.constraints.Email; +import javax.validation.constraints.NotBlank; import java.util.List; @Service @@ -38,31 +39,32 @@ public class TestHelperServiceImpl implements TestHelperService { @Override @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) - public void deleteAllRegistrationProcess() { + public void deleteAllRegistrations() { userRegistrationRepository.deleteAll(); - } @Override @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) - public void deleteAllActionItem() { - taskRepository.deleteAll(); + public void deleteAllPasswordRecoveries() { + userPasswordRecoveryRepository.deleteAll(); } @Override @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) - public void deleteAllCategory() { - List roots = projectRepository.findByParentIsNull(); - for(Project root:roots){ - remove(root); - } + public void deleteAllTasks() { + taskRepository.deleteAll(); } - private void remove(Project root){ - for(Project child:root.getChildren()){ - remove(child); + @Override + @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) + public void deleteAllProjects() { + List projects = projectRepository.findAll(); + for(Project project:projects){ + project.setParent(null); } - projectRepository.delete(root); + projectRepository.saveAll(projects); + projectRepository.flush(); + projectRepository.deleteAll(); } @Override @@ -77,12 +79,17 @@ public int getNumberOfAllRegistrations() { } @Override - public UserRegistration findByEmailRegistration(String email) { + public int getNumberOfAllPasswordRecoveries() { + return userPasswordRecoveryRepository.findAll().size(); + } + + @Override + public UserRegistration findRegistrationByEmail(@Email @NotBlank String email) { return userRegistrationRepository.findByEmail(email); } @Override - public UserPasswordRecovery findByEmailPasswordRecovery(String email) { + public UserPasswordRecovery findPasswordRecoveryByEmail(@Email @NotBlank String email) { return userPasswordRecoveryRepository.findByEmail(email); } } diff --git a/src/test/java/org/woehlke/simpleworklist/testdata/TestDataServiceTest.java b/src/test/java/org/woehlke/simpleworklist/application/testdata/TestDataServiceTest.java similarity index 88% rename from src/test/java/org/woehlke/simpleworklist/testdata/TestDataServiceTest.java rename to src/test/java/org/woehlke/simpleworklist/application/testdata/TestDataServiceTest.java index f8586813..52993e6d 100644 --- a/src/test/java/org/woehlke/simpleworklist/testdata/TestDataServiceTest.java +++ b/src/test/java/org/woehlke/simpleworklist/application/testdata/TestDataServiceTest.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.testdata; +package org.woehlke.simpleworklist.application.testdata; import lombok.extern.slf4j.Slf4j; @@ -10,7 +10,7 @@ import org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext; import org.springframework.test.web.servlet.MockMvc; import org.springframework.web.context.WebApplicationContext; -import org.woehlke.simpleworklist.config.UserAccountTestDataService; +import org.woehlke.simpleworklist.application.config.UserAccountTestDataService; import org.woehlke.simpleworklist.user.account.UserAccount; import java.net.URL; @@ -53,6 +53,6 @@ public void createTestCategoryTreeForUserAccountTest(){ userAccountTestDataService.setUp(); UserAccount userAccount = userAccountTestDataService.getFirstUserAccount(); //TODO: #128 - //testDataService.createTestCategoryTreeForUserAccount(userAccount); + testDataService.createTestCategoryTreeForUserAccount(userAccount); } } diff --git a/src/test/java/org/woehlke/simpleworklist/breadcrumb/BreadcrumbServiceTest.java b/src/test/java/org/woehlke/simpleworklist/breadcrumb/BreadcrumbServiceTest.java deleted file mode 100644 index c1c6ae29..00000000 --- a/src/test/java/org/woehlke/simpleworklist/breadcrumb/BreadcrumbServiceTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.woehlke.simpleworklist.breadcrumb; - -public class BreadcrumbServiceTest { -} diff --git a/src/test/java/org/woehlke/simpleworklist/error/MyErrorControllerTest.java b/src/test/java/org/woehlke/simpleworklist/error/MyErrorControllerTest.java deleted file mode 100644 index 0c8dec43..00000000 --- a/src/test/java/org/woehlke/simpleworklist/error/MyErrorControllerTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.woehlke.simpleworklist.error; - -public class MyErrorControllerTest { -} diff --git a/src/test/java/org/woehlke/simpleworklist/helper/TestHelperService.java b/src/test/java/org/woehlke/simpleworklist/helper/TestHelperService.java deleted file mode 100644 index 8e75f608..00000000 --- a/src/test/java/org/woehlke/simpleworklist/helper/TestHelperService.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.woehlke.simpleworklist.helper; - -import org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecovery; -import org.woehlke.simpleworklist.user.register.UserRegistration; - -public interface TestHelperService { - - void deleteAllRegistrationProcess(); - - void deleteAllActionItem(); - - void deleteAllCategory(); - - void deleteUserAccount(); - - int getNumberOfAllRegistrations(); - - UserRegistration findByEmailRegistration(String email); - - UserPasswordRecovery findByEmailPasswordRecovery(String email); -} diff --git a/src/test/java/org/woehlke/simpleworklist/testdata/TestDataControllerTest.java b/src/test/java/org/woehlke/simpleworklist/testdata/TestDataControllerTest.java deleted file mode 100644 index 490a1802..00000000 --- a/src/test/java/org/woehlke/simpleworklist/testdata/TestDataControllerTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.woehlke.simpleworklist.testdata; - -public class TestDataControllerTest { -} diff --git a/src/test/java/org/woehlke/simpleworklist/user/account/UserAccountPasswordEncodedTest.java b/src/test/java/org/woehlke/simpleworklist/user/account/UserAccountPasswordEncodedTest.java index a88bde8b..225bfc24 100644 --- a/src/test/java/org/woehlke/simpleworklist/user/account/UserAccountPasswordEncodedTest.java +++ b/src/test/java/org/woehlke/simpleworklist/user/account/UserAccountPasswordEncodedTest.java @@ -2,7 +2,7 @@ import org.springframework.security.crypto.password.PasswordEncoder; -import org.woehlke.simpleworklist.config.AbstractTest; +import org.woehlke.simpleworklist.application.config.AbstractTest; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/woehlke/simpleworklist/user/account/UserAccountServiceImplTest.java b/src/test/java/org/woehlke/simpleworklist/user/account/UserAccountServiceImplTest.java index 611f4478..840f5e98 100644 --- a/src/test/java/org/woehlke/simpleworklist/user/account/UserAccountServiceImplTest.java +++ b/src/test/java/org/woehlke/simpleworklist/user/account/UserAccountServiceImplTest.java @@ -8,7 +8,7 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UsernameNotFoundException; -import org.woehlke.simpleworklist.config.AbstractTest; +import org.woehlke.simpleworklist.application.config.AbstractTest; import org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecoveryService; import org.woehlke.simpleworklist.user.register.UserRegistrationService; import org.woehlke.simpleworklist.user.login.LoginForm; diff --git a/src/test/java/org/woehlke/simpleworklist/user/chat/User2UserMessageControllerTest.java b/src/test/java/org/woehlke/simpleworklist/user/chat/User2UserMessageControllerTest.java new file mode 100644 index 00000000..8b51628a --- /dev/null +++ b/src/test/java/org/woehlke/simpleworklist/user/chat/User2UserMessageControllerTest.java @@ -0,0 +1,4 @@ +package org.woehlke.simpleworklist.user.chat; + +public class User2UserMessageControllerTest { +} diff --git a/src/test/java/org/woehlke/simpleworklist/user/chat/User2UserMessageServiceTest.java b/src/test/java/org/woehlke/simpleworklist/user/chat/User2UserMessageServiceTest.java new file mode 100644 index 00000000..30cad7ef --- /dev/null +++ b/src/test/java/org/woehlke/simpleworklist/user/chat/User2UserMessageServiceTest.java @@ -0,0 +1,4 @@ +package org.woehlke.simpleworklist.user.chat; + +public class User2UserMessageServiceTest { +} diff --git a/src/test/java/org/woehlke/simpleworklist/user/login/UserLoginControllerTest.java b/src/test/java/org/woehlke/simpleworklist/user/login/UserLoginControllerTest.java index 2d128668..f78e9776 100644 --- a/src/test/java/org/woehlke/simpleworklist/user/login/UserLoginControllerTest.java +++ b/src/test/java/org/woehlke/simpleworklist/user/login/UserLoginControllerTest.java @@ -5,7 +5,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view; -import org.woehlke.simpleworklist.config.AbstractTest; +import org.woehlke.simpleworklist.application.config.AbstractTest; public class UserLoginControllerTest extends AbstractTest { diff --git a/src/test/java/org/woehlke/simpleworklist/user/messages/User2UserMessageControllerTest.java b/src/test/java/org/woehlke/simpleworklist/user/messages/User2UserMessageControllerTest.java deleted file mode 100644 index d57f4999..00000000 --- a/src/test/java/org/woehlke/simpleworklist/user/messages/User2UserMessageControllerTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.woehlke.simpleworklist.user.messages; - -public class User2UserMessageControllerTest { -} diff --git a/src/test/java/org/woehlke/simpleworklist/user/messages/User2UserMessageServiceTest.java b/src/test/java/org/woehlke/simpleworklist/user/messages/User2UserMessageServiceTest.java deleted file mode 100644 index 9add05b7..00000000 --- a/src/test/java/org/woehlke/simpleworklist/user/messages/User2UserMessageServiceTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.woehlke.simpleworklist.user.messages; - -public class User2UserMessageServiceTest { -} diff --git a/src/test/java/org/woehlke/simpleworklist/user/register/UserRegistrationControllerTest.java b/src/test/java/org/woehlke/simpleworklist/user/register/UserRegistrationControllerTest.java index dcb09412..9570dbe3 100644 --- a/src/test/java/org/woehlke/simpleworklist/user/register/UserRegistrationControllerTest.java +++ b/src/test/java/org/woehlke/simpleworklist/user/register/UserRegistrationControllerTest.java @@ -1,6 +1,6 @@ package org.woehlke.simpleworklist.user.register; -import org.woehlke.simpleworklist.config.AbstractTest; +import org.woehlke.simpleworklist.application.config.AbstractTest; import org.springframework.beans.factory.annotation.Autowired; @@ -40,7 +40,7 @@ public void testRegisterNewUserCheckResponseAndRegistrationForm() throws Excepti } catch (InterruptedException e) { e.printStackTrace(); } - UserRegistration o = testHelperService.findByEmailRegistration(emails[0]); + UserRegistration o = testHelperService.findRegistrationByEmail(emails[0]); assertNotNull(o); boolean result = o.getDoubleOptInStatus()== UserRegistrationStatus.REGISTRATION_SAVED_EMAIL || o.getDoubleOptInStatus()== UserRegistrationStatus.REGISTRATION_SENT_MAIL; diff --git a/src/test/java/org/woehlke/simpleworklist/user/register/UserRegistrationServiceImplTest.java b/src/test/java/org/woehlke/simpleworklist/user/register/UserRegistrationServiceImplTest.java index 99d2b26a..7b274b7e 100644 --- a/src/test/java/org/woehlke/simpleworklist/user/register/UserRegistrationServiceImplTest.java +++ b/src/test/java/org/woehlke/simpleworklist/user/register/UserRegistrationServiceImplTest.java @@ -1,7 +1,7 @@ package org.woehlke.simpleworklist.user.register; import org.springframework.beans.factory.annotation.Value; -import org.woehlke.simpleworklist.config.AbstractTest; +import org.woehlke.simpleworklist.application.config.AbstractTest; import org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecovery; import org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecoveryService; @@ -35,7 +35,7 @@ public void testIsRetryAndMaximumNumberOfRetries(){ } catch (InterruptedException e) { e.printStackTrace(); } - UserRegistration o = testHelperService.findByEmailRegistration(emails[0]); + UserRegistration o = testHelperService.findRegistrationByEmail(emails[0]); assertTrue(o.getEmail().compareTo(emails[0])==0); o.setNumberOfRetries(maxRetries); userRegistrationService.registrationClickedInEmail(o); @@ -47,13 +47,13 @@ public void testIsRetryAndMaximumNumberOfRetries(){ //@Test public void testCheckIfResponseIsInTimeNewUser(){ userRegistrationService.registrationCheckIfResponseIsInTime(emails[0]); - UserRegistration o = testHelperService.findByEmailRegistration(emails[0]); + UserRegistration o = testHelperService.findRegistrationByEmail(emails[0]); assertNotNull(o); o.setRowCreatedAt(new Date(o.getRowCreatedAt().getTime() - ttlEmailVerificationRequest)); o.setNumberOfRetries(0); userRegistrationService.registrationClickedInEmail(o); userRegistrationService.registrationCheckIfResponseIsInTime(emails[0]); - o = testHelperService.findByEmailRegistration(emails[0]); + o = testHelperService.findRegistrationByEmail(emails[0]); assertNull(o); } @@ -66,13 +66,13 @@ public void testCheckIfResponseIsInTime(){ e.printStackTrace(); } userPasswordRecoveryService.passwordRecoveryCheckIfResponseIsInTime(emails[0]); - UserPasswordRecovery o = testHelperService.findByEmailPasswordRecovery(emails[0]); + UserPasswordRecovery o = testHelperService.findPasswordRecoveryByEmail(emails[0]); assertNotNull(o); o.setRowCreatedAt(new Date(o.getRowCreatedAt().getTime() - ttlEmailVerificationRequest)); o.setNumberOfRetries(0); userPasswordRecoveryService.passwordRecoveryClickedInEmail(o); userPasswordRecoveryService.passwordRecoveryCheckIfResponseIsInTime(emails[0]); - o = testHelperService.findByEmailPasswordRecovery(emails[0]); + o = testHelperService.findPasswordRecoveryByEmail(emails[0]); assertNull(o); } } diff --git a/src/test/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryControllerTest.java b/src/test/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryControllerTest.java index 126a5af1..32fb952f 100644 --- a/src/test/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryControllerTest.java +++ b/src/test/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryControllerTest.java @@ -1,6 +1,6 @@ package org.woehlke.simpleworklist.user.resetpassword; -import org.woehlke.simpleworklist.config.AbstractTest; +import org.woehlke.simpleworklist.application.config.AbstractTest; import org.springframework.beans.factory.annotation.Autowired; @@ -39,7 +39,7 @@ public void testEnterNewPasswordFormularWithToken() throws Exception { } catch (InterruptedException e) { e.printStackTrace(); } - UserPasswordRecovery o = testHelperService.findByEmailPasswordRecovery(emails[0]); + UserPasswordRecovery o = testHelperService.findPasswordRecoveryByEmail(emails[0]); assertNotNull(o); boolean result = o.getDoubleOptInStatus()== UserPasswordRecoveryStatus.PASSWORD_RECOVERY_SAVED_EMAIL || o.getDoubleOptInStatus()== UserPasswordRecoveryStatus.PASSWORD_RECOVERY_SENT_EMAIL;