From 44b0162976b5d4bd41642bc90f6c21a6ab732212 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 01:40:15 +0200
Subject: [PATCH 01/47] Fixed #169, Fixed #170, Fixed #171, Fixed #172, Fixed
 #183

---
 etc/requirements/Requirements.md | 45 +++++++++++++++++---------------
 1 file changed, 24 insertions(+), 21 deletions(-)

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

From 67024e19590e14d046516f14dc86aa0082a5fc33 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 08:19:32 +0200
Subject: [PATCH 02/47] work in progress

---
 .gitignore                                    |   6 +-
 .idea/compiler.xml                            |  22 ++++
 .idea/encodings.xml                           |   6 +
 .idea/jarRepositories.xml                     |  20 +++
 .idea/libraries/Maven__antlr_antlr_2_7_7.xml  |  13 ++
 ...valon_framework_avalon_framework_4_1_3.xml |  13 ++
 ...oncurrent_backport_util_concurrent_3_1.xml |  13 ++
 ..._ch_ethz_ganymed_ganymed_ssh2_build210.xml |  13 ++
 ...__ch_qos_logback_logback_classic_1_2_3.xml |  13 ++
 ...ven__ch_qos_logback_logback_core_1_2_3.xml |  13 ++
 .../Maven__classworlds_classworlds_1_1.xml    |  13 ++
 .../Maven__com_beust_jcommander_1_72.xml      |  13 ++
 ...ompose_maven_plugin_maven_plugin_4_0_0.xml |  13 ++
 .../Maven__com_fasterxml_classmate_1_5_1.xml  |  13 ++
 ...ackson_core_jackson_annotations_2_10_3.xml |  13 ++
 ...erxml_jackson_core_jackson_core_2_10_3.xml |  13 ++
 ...l_jackson_core_jackson_databind_2_10_3.xml |  13 ++
 ..._datatype_jackson_datatype_jdk8_2_10_3.xml |  13 ++
 ...atatype_jackson_datatype_jsr310_2_10_3.xml |  13 ++
 ..._jackson_module_parameter_names_2_10_3.xml |  13 ++
 ..._thymeleaf_extras_data_attribute_2_0_1.xml |  13 ++
 ...en__com_github_spotbugs_spotbugs_4_0_0.xml |  13 ++
 ...ub_spotbugs_spotbugs_annotations_4_0_0.xml |  13 ++
 ...otbugs_maven_plugin_maven_plugin_4_0_0.xml |  13 ++
 ..._com_google_code_findbugs_jsr305_3_0_2.xml |  13 ++
 ...Maven__com_google_code_gson_gson_2_8_6.xml |  13 ++
 ...rorprone_error_prone_annotations_2_3_4.xml |  13 ++
 ...__com_google_guava_failureaccess_1_0_1.xml |  13 ++
 ...Maven__com_google_guava_guava_28_2_jre.xml |  13 ++
 ...9_0_empty_to_avoid_conflict_with_guava.xml |  13 ++
 ...m_google_j2objc_j2objc_annotations_1_3.xml |  13 ++
 ...n__com_jayway_jsonpath_json_path_2_4_0.xml |  13 ++
 ...__com_puppycrawl_tools_checkstyle_8_29.xml |  13 ++
 ...un_activation_jakarta_activation_1_2_2.xml |  13 ++
 ...un_istack_istack_commons_runtime_3_0_8.xml |  13 ++
 ...Maven__com_sun_mail_jakarta_mail_1_6_5.xml |  13 ++
 ...ven__com_sun_xml_bind_jaxb_impl_2_1_13.xml |  13 ++
 ...sun_xml_fastinfoset_FastInfoset_1_2_16.xml |  13 ++
 ...ven__com_thoughtworks_qdox_qdox_2_0_M8.xml |  13 ++
 ...ogle_android_json_0_0_20131108_vaadin1.xml |  13 ++
 ..._com_vladsch_flexmark_flexmark_0_42_14.xml |  13 ++
 ..._vladsch_flexmark_flexmark_all_0_42_14.xml |  13 ++
 ...mark_flexmark_ext_abbreviation_0_42_14.xml |  13 ++
 ...exmark_flexmark_ext_admonition_0_42_14.xml |  13 ++
 ...exmark_flexmark_ext_anchorlink_0_42_14.xml |  13 ++
 ...ch_flexmark_flexmark_ext_aside_0_42_14.xml |  13 ++
 ...exmark_flexmark_ext_attributes_0_42_14.xml |  13 ++
 ...flexmark_flexmark_ext_autolink_0_42_14.xml |  13 ++
 ...exmark_flexmark_ext_definition_0_42_14.xml |  13 ++
 ...ch_flexmark_flexmark_ext_emoji_0_42_14.xml |  13 ++
 ...xmark_ext_enumerated_reference_0_42_14.xml |  13 ++
 ...flexmark_ext_escaped_character_0_42_14.xml |  13 ++
 ...lexmark_flexmark_ext_footnotes_0_42_14.xml |  13 ++
 ...exmark_flexmark_ext_gfm_issues_0_42_14.xml |  13 ++
 ...flexmark_ext_gfm_strikethrough_0_42_14.xml |  13 ++
 ...exmark_flexmark_ext_gfm_tables_0_42_14.xml |  13 ++
 ...mark_flexmark_ext_gfm_tasklist_0_42_14.xml |  13 ++
 ...lexmark_flexmark_ext_gfm_users_0_42_14.xml |  13 ++
 ...h_flexmark_flexmark_ext_gitlab_0_42_14.xml |  13 ++
 ...dsch_flexmark_flexmark_ext_ins_0_42_14.xml |  13 ++
 ...exmark_ext_jekyll_front_matter_0_42_14.xml |  13 ++
 ...exmark_flexmark_ext_jekyll_tag_0_42_14.xml |  13 ++
 ...h_flexmark_flexmark_ext_macros_0_42_14.xml |  13 ++
 ...exmark_flexmark_ext_media_tags_0_42_14.xml |  13 ++
 ...xmark_flexmark_ext_superscript_0_42_14.xml |  13 ++
 ...h_flexmark_flexmark_ext_tables_0_42_14.xml |  13 ++
 ...dsch_flexmark_flexmark_ext_toc_0_42_14.xml |  13 ++
 ...xmark_flexmark_ext_typographic_0_42_14.xml |  13 ++
 ...flexmark_flexmark_ext_wikilink_0_42_14.xml |  13 ++
 ...mark_flexmark_ext_xwiki_macros_0_42_14.xml |  13 ++
 ...flexmark_ext_yaml_front_matter_0_42_14.xml |  13 ++
 ..._flexmark_ext_youtube_embedded_0_42_14.xml |  13 ++
 ...ch_flexmark_flexmark_formatter_0_42_14.xml |  13 ++
 ..._flexmark_flexmark_html_parser_0_42_14.xml |  13 ++
 ...exmark_flexmark_jira_converter_0_42_14.xml |  13 ++
 ...xmark_flexmark_profile_pegdown_0_42_14.xml |  13 ++
 ...vladsch_flexmark_flexmark_util_0_42_14.xml |  13 ++
 ...rk_flexmark_youtrack_converter_0_42_14.xml |  13 ++
 .../Maven__com_zaxxer_HikariCP_3_4_2.xml      |  13 ++
 ...mons_beanutils_commons_beanutils_1_9_4.xml |  13 ++
 ...Maven__commons_chain_commons_chain_1_2.xml |  13 ++
 ...aven__commons_codec_commons_codec_1_13.xml |  13 ++
 ..._collections_commons_collections_3_2_2.xml |  13 ++
 ..._commons_digester_commons_digester_2_1.xml |  13 ++
 ...ns_httpclient_commons_httpclient_3_0_1.xml |  13 ++
 .../Maven__commons_io_commons_io_2_5.xml      |  13 ++
 .../Maven__commons_lang_commons_lang_2_6.xml  |  13 ++
 ...n__commons_logging_commons_logging_1_1.xml |  13 ++
 ...ommons_validator_commons_validator_1_6.xml |  13 ++
 .idea/libraries/Maven__dom4j_dom4j_1_1.xml    |  13 ++
 .../Maven__info_picocli_picocli_4_1_4.xml     |  13 ++
 ...en_thymeleaf_spring_data_dialect_3_4_0.xml |  13 ++
 ...ctivation_jakarta_activation_api_1_2_2.xml |  13 ++
 ...nnotation_jakarta_annotation_api_1_3_5.xml |  13 ++
 ...sistence_jakarta_persistence_api_2_2_3.xml |  13 ++
 ...nsaction_jakarta_transaction_api_1_3_3.xml |  13 ++
 ...alidation_jakarta_validation_api_2_0_2.xml |  13 ++
 ...ta_xml_bind_jakarta_xml_bind_api_2_3_3.xml |  13 ++
 ...Maven__javax_activation_activation_1_1.xml |  13 ++
 ..._activation_javax_activation_api_1_2_0.xml |  13 ++
 .../libraries/Maven__javax_mail_mail_1_4.xml  |  13 ++
 ..._javax_servlet_javax_servlet_api_4_0_1.xml |  13 ++
 .../Maven__javax_ws_rs_jsr311_api_1_1_1.xml   |  13 ++
 .../Maven__javax_xml_bind_jaxb_api_2_3_1.xml  |  13 ++
 .idea/libraries/Maven__jaxen_jaxen_1_2_0.xml  |  13 ++
 .idea/libraries/Maven__jdom_jdom_1_0.xml      |  13 ++
 .idea/libraries/Maven__junit_junit_4_12.xml   |  13 ++
 .idea/libraries/Maven__log4j_log4j_1_2_12.xml |  13 ++
 .../libraries/Maven__logkit_logkit_1_0_1.xml  |  13 ++
 ...Maven__net_bytebuddy_byte_buddy_1_10_8.xml |  13 ++
 ..._net_bytebuddy_byte_buddy_agent_1_10_8.xml |  13 ++
 .../Maven__net_java_dev_javacc_javacc_5_0.xml |  13 ++
 .../Maven__net_jcip_jcip_annotations_1_0.xml  |  13 ++
 ...Maven__net_minidev_accessors_smart_1_2.xml |  13 ++
 .../Maven__net_minidev_json_smart_2_3.xml     |  13 ++
 .../Maven__net_sf_saxon_Saxon_HE_9_9_1_6.xml  |  13 ++
 ...n__net_sourceforge_pmd_pmd_core_6_21_0.xml |  13 ++
 ...n__net_sourceforge_pmd_pmd_java_6_21_0.xml |  13 ++
 ..._sourceforge_pmd_pmd_javascript_6_21_0.xml |  13 ++
 ...en__net_sourceforge_pmd_pmd_jsp_6_21_0.xml |  13 ++
 ...n__net_sourceforge_saxon_saxon_9_1_0_8.xml |  13 ++
 ...et_sourceforge_saxon_saxon_dom_9_1_0_8.xml |  13 ++
 .idea/libraries/Maven__ognl_ognl_3_1_12.xml   |  13 ++
 .../Maven__org_antlr_antlr4_runtime_4_8_1.xml |  13 ++
 .../Maven__org_apache_ant_ant_1_10_7.xml      |  13 ++
 ...en__org_apache_ant_ant_launcher_1_10_7.xml |  13 ++
 .../Maven__org_apache_bcel_bcel_6_2.xml       |  13 ++
 ...g_apache_commons_commons_compress_1_20.xml |  13 ++
 ...__org_apache_commons_commons_lang3_3_9.xml |  13 ++
 .../Maven__org_apache_cxf_cxf_api_2_6_3.xml   |  13 ++
 ...g_apache_cxf_cxf_rt_bindings_xml_2_6_3.xml |  13 ++
 ...aven__org_apache_cxf_cxf_rt_core_2_6_3.xml |  13 ++
 ...apache_cxf_cxf_rt_frontend_jaxrs_2_6_3.xml |  13 ++
 ...pache_cxf_cxf_rt_transports_http_2_6_3.xml |  13 ++
 ...avamail_geronimo_javamail_1_4_mail_1_7.xml |  13 ++
 ...ail_geronimo_javamail_1_4_provider_1_7.xml |  13 ++
 ...o_specs_geronimo_javamail_1_4_spec_1_7.xml |  13 ++
 ...pache_httpcomponents_httpclient_4_5_12.xml |  13 ++
 ..._apache_httpcomponents_httpcore_4_4_13.xml |  13 ++
 ..._apache_logging_log4j_log4j_api_2_12_1.xml |  13 ++
 ...he_logging_log4j_log4j_to_slf4j_2_12_1.xml |  13 ++
 ..._org_apache_maven_doxia_doxia_core_1_9.xml |  13 ++
 ...ven_doxia_doxia_decoration_model_1_9_2.xml |  13 ++
 ...en_doxia_doxia_integration_tools_1_9_2.xml |  13 ++
 ...ache_maven_doxia_doxia_logging_api_1_7.xml |  13 ++
 ...che_maven_doxia_doxia_module_apt_1_9_1.xml |  13 ++
 ...en_doxia_doxia_module_confluence_1_9_1.xml |  13 ++
 ...oxia_doxia_module_docbook_simple_1_9_1.xml |  13 ++
 ...che_maven_doxia_doxia_module_fml_1_9_1.xml |  13 ++
 ...aven_doxia_doxia_module_markdown_1_9_1.xml |  13 ++
 ...e_maven_doxia_doxia_module_twiki_1_9_1.xml |  13 ++
 ...he_maven_doxia_doxia_module_xdoc_1_9_1.xml |  13 ++
 ..._maven_doxia_doxia_module_xhtml5_1_9_1.xml |  13 ++
 ...e_maven_doxia_doxia_module_xhtml_1_9_1.xml |  13 ++
 ..._apache_maven_doxia_doxia_sink_api_1_7.xml |  13 ++
 ..._maven_doxia_doxia_site_renderer_1_7_4.xml |  13 ++
 ...che_maven_doxia_doxia_skin_model_1_7_4.xml |  13 ++
 ...e_maven_enforcer_enforcer_api_3_0_0_M3.xml |  13 ++
 ...maven_enforcer_enforcer_rules_3_0_0_M3.xml |  13 ++
 ...apache_maven_maven_aether_provider_3_0.xml |  13 ++
 ..._org_apache_maven_maven_archiver_3_4_0.xml |  13 ++
 ...n__org_apache_maven_maven_artifact_3_0.xml |  13 ++
 ...che_maven_maven_artifact_manager_2_2_1.xml |  13 ++
 ...ven__org_apache_maven_maven_compat_3_0.xml |  13 ++
 ...Maven__org_apache_maven_maven_core_3_0.xml |  13 ++
 ...aven__org_apache_maven_maven_jxr_3_0_0.xml |  13 ++
 ...aven__org_apache_maven_maven_model_3_0.xml |  13 ++
 ...g_apache_maven_maven_model_builder_3_0.xml |  13 ++
 ..._org_apache_maven_maven_plugin_api_3_0.xml |  13 ++
 ...he_maven_maven_plugin_descriptor_2_2_1.xml |  13 ++
 ...ache_maven_maven_plugin_registry_2_2_1.xml |  13 ++
 ...__org_apache_maven_maven_profile_2_2_1.xml |  13 ++
 ...__org_apache_maven_maven_project_2_2_1.xml |  13 ++
 ...he_maven_maven_repository_metadata_3_0.xml |  13 ++
 ...n__org_apache_maven_maven_settings_3_0.xml |  13 ++
 ...pache_maven_maven_settings_builder_3_0.xml |  13 ++
 ...org_apache_maven_maven_toolchain_2_2_1.xml |  13 ++
 ...n_tools_maven_plugin_annotations_3_5_2.xml |  13 ++
 ...ven_changes_plugin_maven_plugin_2_12_1.xml |  13 ++
 ...n_checkstyle_plugin_maven_plugin_3_1_1.xml |  13 ++
 ..._maven_clean_plugin_maven_plugin_3_1_0.xml |  13 ++
 ...ven_compiler_plugin_maven_plugin_3_8_1.xml |  13 ++
 ...n_dependency_plugin_maven_plugin_3_1_2.xml |  13 ++
 ..._enforcer_plugin_maven_plugin_3_0_0_M3.xml |  13 ++
 ...aven_invoker_plugin_maven_plugin_3_2_1.xml |  13 ++
 ...ns_maven_jxr_plugin_maven_plugin_3_0_0.xml |  13 ++
 ...s_maven_pmd_plugin_maven_plugin_3_13_0.xml |  13 ++
 ...info_reports_plugin_maven_plugin_3_0_0.xml |  13 ++
 ...s_maven_site_plugin_maven_plugin_3_9_0.xml |  13 ++
 ...en_surefire_plugin_maven_plugin_2_22_2.xml |  13 ++
 ...re_report_plugin_maven_plugin_3_0_0_M4.xml |  13 ++
 ...aven_reporting_maven_reporting_api_3_0.xml |  13 ++
 ...ven_reporting_maven_reporting_exec_1_4.xml |  13 ++
 ...ven_reporting_maven_reporting_impl_2_4.xml |  13 ++
 ...aven_resolver_maven_resolver_api_1_4_1.xml |  13 ++
 ...ven_resolver_maven_resolver_util_1_4_1.xml |  13 ++
 ..._apache_maven_scm_maven_scm_api_1_10_0.xml |  13 ++
 ...en_scm_maven_scm_manager_plexus_1_10_0.xml |  13 ++
 ..._maven_scm_provider_cvs_commons_1_10_0.xml |  13 ++
 ...n_scm_maven_scm_provider_cvsexe_1_10_0.xml |  13 ++
 ..._scm_maven_scm_provider_cvsjava_1_10_0.xml |  13 ++
 ..._maven_scm_provider_git_commons_1_10_0.xml |  13 ++
 ...n_scm_maven_scm_provider_gitexe_1_10_0.xml |  13 ++
 ...maven_scm_maven_scm_provider_hg_1_10_0.xml |  13 ++
 ...scm_maven_scm_provider_perforce_1_10_0.xml |  13 ++
 ...scm_maven_scm_provider_starteam_1_10_0.xml |  13 ++
 ..._maven_scm_provider_svn_commons_1_10_0.xml |  13 ++
 ...n_scm_maven_scm_provider_svnexe_1_10_0.xml |  13 ++
 ...che_maven_shared_file_management_3_0_0.xml |  13 ++
 ..._shared_maven_artifact_transfer_0_11_0.xml |  13 ++
 ...ed_maven_common_artifact_filters_3_1_0.xml |  13 ++
 ...hared_maven_dependency_analyzer_1_11_1.xml |  13 ++
 ...ven_shared_maven_dependency_tree_3_0_1.xml |  13 ++
 ...pache_maven_shared_maven_filtering_1_3.xml |  13 ++
 ...pache_maven_shared_maven_invoker_3_0_1.xml |  13 ++
 ...en_shared_maven_script_interpreter_1_2.xml |  13 ++
 ...en_shared_maven_shared_incremental_1_1.xml |  13 ++
 ...che_maven_shared_maven_shared_io_3_0_0.xml |  13 ++
 ...ache_maven_shared_maven_shared_jar_1_2.xml |  13 ++
 ..._maven_shared_maven_shared_utils_3_2_1.xml |  13 ++
 ..._surefire_maven_surefire_common_2_22_2.xml |  13 ++
 ...che_maven_surefire_surefire_api_2_22_2.xml |  13 ++
 ..._maven_surefire_surefire_booter_2_22_2.xml |  13 ++
 ..._surefire_surefire_logger_api_3_0_0_M4.xml |  13 ++
 ...refire_surefire_report_parser_3_0_0_M4.xml |  13 ++
 ...ven_wagon_wagon_http_lightweight_3_1_0.xml |  13 ++
 ...he_maven_wagon_wagon_http_shared_3_1_0.xml |  13 ++
 ...e_maven_wagon_wagon_provider_api_3_3_1.xml |  13 ++
 ...n__org_apache_struts_struts_core_1_3_8.xml |  13 ++
 ..._org_apache_struts_struts_taglib_1_3_8.xml |  13 ++
 ...__org_apache_struts_struts_tiles_1_3_8.xml |  13 ++
 ..._tomcat_embed_tomcat_embed_core_9_0_33.xml |  13 ++
 ...he_tomcat_embed_tomcat_embed_el_9_0_33.xml |  13 ++
 ...at_embed_tomcat_embed_websocket_9_0_33.xml |  13 ++
 ...aven__org_apache_velocity_velocity_1_7.xml |  13 ++
 ...org_apache_velocity_velocity_tools_2_0.xml |  13 ++
 ...pache_ws_commons_ws_commons_util_1_0_1.xml |  13 ++
 ...ache_ws_xmlschema_xmlschema_core_2_0_3.xml |  13 ++
 ...en__org_apache_xbean_xbean_reflect_3_7.xml |  13 ++
 ...n__org_apache_xmlrpc_xmlrpc_client_3_0.xml |  13 ++
 ...n__org_apache_xmlrpc_xmlrpc_common_3_0.xml |  13 ++
 ..._org_apiguardian_apiguardian_api_1_1_0.xml |  13 ++
 ...Maven__org_aspectj_aspectjweaver_1_9_5.xml |  13 ++
 ...Maven__org_assertj_assertj_core_3_13_2.xml |  13 ++
 ...rg_attoparser_attoparser_2_0_5_RELEASE.xml |  13 ++
 .../Maven__org_beanshell_bsh_2_0b4.xml        |  13 ++
 ...g_checkerframework_checker_qual_2_10_0.xml |  13 ++
 ...ven__org_codehaus_groovy_groovy_2_5_10.xml |  13 ++
 ...__org_codehaus_groovy_groovy_all_2_4_8.xml |  13 ++
 ..._codehaus_groovy_groovy_ant_indy_3_0_2.xml |  13 ++
 ...ehaus_groovy_groovy_cli_picocli_2_5_10.xml |  13 ++
 ...haus_groovy_groovy_dateutil_indy_3_0_2.xml |  13 ++
 ...haus_groovy_groovy_docgenerator_2_5_10.xml |  13 ++
 ...odehaus_groovy_groovy_groovydoc_2_5_10.xml |  13 ++
 ..._org_codehaus_groovy_groovy_indy_3_0_2.xml |  13 ++
 ...odehaus_groovy_groovy_templates_2_5_10.xml |  13 ++
 ..._org_codehaus_groovy_groovy_xml_2_5_10.xml |  13 ++
 ..._codehaus_plexus_plexus_archiver_4_2_2.xml |  13 ++
 ...dehaus_plexus_plexus_classworlds_2_5_2.xml |  13 ++
 ...ehaus_plexus_plexus_compiler_api_2_8_4.xml |  13 ++
 ...aus_plexus_plexus_compiler_javac_2_8_4.xml |  13 ++
 ...s_plexus_plexus_compiler_manager_2_8_4.xml |  13 ++
 ...xus_plexus_component_annotations_2_0_0.xml |  13 ++
 ..._plexus_plexus_container_default_2_1_0.xml |  13 ++
 ..._org_codehaus_plexus_plexus_digest_1_0.xml |  13 ++
 ...codehaus_plexus_plexus_i18n_1_0_beta_7.xml |  13 ++
 ...ehaus_plexus_plexus_interpolation_1_26.xml |  13 ++
 ...n__org_codehaus_plexus_plexus_io_3_2_0.xml |  13 ++
 ...org_codehaus_plexus_plexus_java_0_9_10.xml |  13 ++
 ...xus_plexus_mail_sender_api_1_0_alpha_7.xml |  13 ++
 ...lexus_mail_sender_javamail_1_0_alpha_7.xml |  13 ++
 ..._plexus_mail_sender_simple_1_0_alpha_7.xml |  13 ++
 ...codehaus_plexus_plexus_resources_1_1_0.xml |  13 ++
 ...org_codehaus_plexus_plexus_utils_3_3_0.xml |  13 ++
 ...rg_codehaus_plexus_plexus_velocity_1_2.xml |  13 ++
 ..._org_codehaus_woodstox_stax2_api_3_1_1.xml |  13 ++
 ...ehaus_woodstox_woodstox_core_asl_4_1_4.xml |  13 ++
 .../Maven__org_dom4j_dom4j_2_1_1.xml          |  13 ++
 ...rg_eclipse_aether_aether_util_0_9_0_M2.xml |  13 ++
 ...ipse_jetty_jetty_http_9_4_27_v20200227.xml |  13 ++
 ...clipse_jetty_jetty_io_9_4_27_v20200227.xml |  13 ++
 ..._jetty_jetty_security_9_4_27_v20200227.xml |  13 ++
 ...se_jetty_jetty_server_9_4_27_v20200227.xml |  13 ++
 ...e_jetty_jetty_servlet_9_4_27_v20200227.xml |  13 ++
 ...ipse_jetty_jetty_util_9_4_27_v20200227.xml |  13 ++
 ...se_jetty_jetty_webapp_9_4_27_v20200227.xml |  13 ++
 ...lipse_jetty_jetty_xml_9_4_27_v20200227.xml |  13 ++
 ...hub_org_eclipse_egit_github_core_2_1_5.xml |  13 ++
 ..._org_glassfish_jaxb_jaxb_runtime_2_3_2.xml |  13 ++
 .../Maven__org_glassfish_jaxb_txw2_2_3_2.xml  |  13 ++
 .../Maven__org_hamcrest_hamcrest_2_1.xml      |  13 ++
 .../Maven__org_hamcrest_hamcrest_core_2_1.xml |  13 ++
 ...ernate_commons_annotations_5_1_0_Final.xml |  13 ++
 ..._hibernate_hibernate_core_5_4_12_Final.xml |  13 ++
 ...dator_hibernate_validator_6_0_18_Final.xml |  13 ++
 .../Maven__org_iq80_snappy_snappy_0_4.xml     |  13 ++
 ...ven__org_javassist_javassist_3_24_0_GA.xml |  13 ++
 .../Maven__org_jboss_jandex_2_1_1_Final.xml   |  13 ++
 ...boss_logging_jboss_logging_3_4_1_Final.xml |  13 ++
 .../Maven__org_jsoup_jsoup_1_8_3.xml          |  13 ++
 ..._org_junit_jupiter_junit_jupiter_5_5_2.xml |  13 ++
 ..._junit_jupiter_junit_jupiter_api_5_5_2.xml |  13 ++
 ...nit_jupiter_junit_jupiter_engine_5_5_2.xml |  13 ++
 ...nit_jupiter_junit_jupiter_params_5_5_2.xml |  13 ++
 ..._platform_junit_platform_commons_1_5_2.xml |  13 ++
 ...t_platform_junit_platform_engine_1_5_2.xml |  13 ++
 .../Maven__org_jvnet_staxex_stax_ex_1_8_1.xml |  13 ++
 .../Maven__org_mockito_mockito_core_3_1_0.xml |  13 ++
 ...rg_mockito_mockito_junit_jupiter_3_1_0.xml |  13 ++
 .../Maven__org_mozilla_rhino_1_7_7_2.xml      |  13 ++
 ...n__org_netbeans_lib_cvsclient_20060125.xml |  13 ++
 ...ven__org_nibor_autolink_autolink_0_6_0.xml |  13 ++
 .../Maven__org_objenesis_objenesis_2_6.xml    |  13 ++
 ...Maven__org_opentest4j_opentest4j_1_2_0.xml |  13 ++
 .../Maven__org_ow2_asm_asm_7_3_1.xml          |  13 ++
 .../Maven__org_ow2_asm_asm_analysis_7_3_1.xml |  13 ++
 .../Maven__org_ow2_asm_asm_commons_7_3_1.xml  |  13 ++
 .../Maven__org_ow2_asm_asm_tree_7_3_1.xml     |  13 ++
 .../Maven__org_ow2_asm_asm_util_7_3_1.xml     |  13 ++
 ...ven__org_postgresql_postgresql_42_2_11.xml |  13 ++
 ...aven__org_projectlombok_lombok_1_18_12.xml |  13 ++
 ...aven__org_skyscreamer_jsonassert_1_5_0.xml |  13 ++
 .../Maven__org_slf4j_jul_to_slf4j_1_7_30.xml  |  13 ++
 .../Maven__org_slf4j_slf4j_api_1_7_30.xml     |  13 ++
 .../Maven__org_slf4j_slf4j_simple_1_7_30.xml  |  13 ++
 ...en__org_sonatype_aether_aether_api_1_7.xml |  13 ++
 ...n__org_sonatype_aether_aether_impl_1_7.xml |  13 ++
 ...en__org_sonatype_aether_aether_spi_1_7.xml |  13 ++
 ...n__org_sonatype_aether_aether_util_1_7.xml |  13 ++
 ...sonatype_plexus_plexus_build_api_0_0_7.xml |  13 ++
 ..._org_sonatype_plexus_plexus_cipher_1_4.xml |  13 ++
 ...atype_plexus_plexus_sec_dispatcher_1_3.xml |  13 ++
 ...g_sonatype_sisu_sisu_guice_noaop_2_1_7.xml |  13 ++
 ...g_sonatype_sisu_sisu_inject_bean_1_4_2.xml |  13 ++
 ...sonatype_sisu_sisu_inject_plexus_1_4_2.xml |  13 ++
 ...amework_boot_spring_boot_2_2_6_RELEASE.xml |  13 ++
 ...pring_boot_autoconfigure_2_2_6_RELEASE.xml |  13 ++
 ...t_configuration_metadata_2_2_6_RELEASE.xml |  13 ++
 ..._configuration_processor_2_2_6_RELEASE.xml |  13 ++
 ...oot_spring_boot_devtools_2_2_6_RELEASE.xml |  13 ++
 ...spring_boot_loader_tools_2_2_6_RELEASE.xml |  13 ++
 ...aven_plugin_maven_plugin_2_2_6_RELEASE.xml |  13 ++
 ...boot_properties_migrator_2_2_6_RELEASE.xml |  13 ++
 ...boot_spring_boot_starter_2_2_6_RELEASE.xml |  13 ++
 ..._spring_boot_starter_aop_2_2_6_RELEASE.xml |  13 ++
 ...ng_boot_starter_data_jpa_2_2_6_RELEASE.xml |  13 ++
 ...spring_boot_starter_jdbc_2_2_6_RELEASE.xml |  13 ++
 ...spring_boot_starter_json_2_2_6_RELEASE.xml |  13 ++
 ...ing_boot_starter_logging_2_2_6_RELEASE.xml |  13 ++
 ...spring_boot_starter_mail_2_2_6_RELEASE.xml |  13 ++
 ...ng_boot_starter_security_2_2_6_RELEASE.xml |  13 ++
 ...spring_boot_starter_test_2_2_6_RELEASE.xml |  13 ++
 ...g_boot_starter_thymeleaf_2_2_6_RELEASE.xml |  13 ++
 ...ring_boot_starter_tomcat_2_2_6_RELEASE.xml |  13 ++
 ..._boot_starter_validation_2_2_6_RELEASE.xml |  13 ++
 ..._spring_boot_starter_web_2_2_6_RELEASE.xml |  13 ++
 ...rk_boot_spring_boot_test_2_2_6_RELEASE.xml |  13 ++
 ..._boot_test_autoconfigure_2_2_6_RELEASE.xml |  13 ++
 ...data_spring_data_commons_2_2_6_RELEASE.xml |  13 ++
 ...ork_data_spring_data_jpa_2_2_6_RELEASE.xml |  13 ++
 ...y_spring_security_config_5_2_2_RELEASE.xml |  13 ++
 ...ity_spring_security_core_5_2_2_RELEASE.xml |  13 ++
 ...ity_spring_security_data_5_2_2_RELEASE.xml |  13 ++
 ...spring_security_remoting_5_2_2_RELEASE.xml |  13 ++
 ...ity_spring_security_test_5_2_2_RELEASE.xml |  13 ++
 ...rity_spring_security_web_5_2_2_RELEASE.xml |  13 ++
 ...sion_spring_session_core_2_2_2_RELEASE.xml |  13 ++
 ...sion_spring_session_jdbc_2_2_2_RELEASE.xml |  13 ++
 ...ringframework_spring_aop_5_2_5_RELEASE.xml |  13 ++
 ...framework_spring_aspects_5_2_5_RELEASE.xml |  13 ++
 ...ngframework_spring_beans_5_2_5_RELEASE.xml |  13 ++
 ...framework_spring_context_5_2_5_RELEASE.xml |  13 ++
 ...k_spring_context_support_5_2_5_RELEASE.xml |  13 ++
 ...ingframework_spring_core_5_2_5_RELEASE.xml |  13 ++
 ...mework_spring_expression_5_2_5_RELEASE.xml |  13 ++
 ...ringframework_spring_jcl_5_2_5_RELEASE.xml |  13 ++
 ...ingframework_spring_jdbc_5_2_5_RELEASE.xml |  13 ++
 ...ringframework_spring_orm_5_2_5_RELEASE.xml |  13 ++
 ...ingframework_spring_test_5_2_5_RELEASE.xml |  13 ++
 ...pringframework_spring_tx_5_2_5_RELEASE.xml |  13 ++
 ...ringframework_spring_web_5_2_5_RELEASE.xml |  13 ++
 ...gframework_spring_webmvc_5_2_5_RELEASE.xml |  13 ++
 ...ymeleaf_extras_java8time_3_0_4_RELEASE.xml |  13 ++
 ...f_extras_springsecurity5_3_0_4_RELEASE.xml |  13 ++
 ...org_thymeleaf_thymeleaf_3_0_11_RELEASE.xml |  13 ++
 ...eleaf_thymeleaf_spring5_3_0_11_RELEASE.xml |  13 ++
 ...meleaf_thymeleaf_testing_3_0_4_RELEASE.xml |  13 ++
 .idea/libraries/Maven__org_tukaani_xz_1_8.xml |  13 ++
 ..._org_unbescape_unbescape_1_1_6_RELEASE.xml |  13 ++
 .../Maven__org_webjars_bootstrap_4_4_1_1.xml  |  13 ++
 .../Maven__org_webjars_ckeditor_4_14_0.xml    |  13 ++
 ...Maven__org_webjars_font_awesome_5_13_0.xml |  13 ++
 .../Maven__org_webjars_jquery_3_4_1.xml       |  13 ++
 .../Maven__org_webjars_popper_js_1_14_3.xml   |  13 ++
 .../Maven__org_xmlunit_xmlunit_core_2_6_4.xml |  13 ++
 .../Maven__org_yaml_snakeyaml_1_25.xml        |  13 ++
 .idea/libraries/Maven__oro_oro_2_0_8.xml      |  13 ++
 .idea/libraries/Maven__rome_rome_1_0.xml      |  13 ++
 .../libraries/Maven__sslext_sslext_1_2_0.xml  |  13 ++
 .../libraries/Maven__wsdl4j_wsdl4j_1_6_3.xml  |  13 ++
 .idea/libraries/Maven__xalan_xalan_2_7_0.xml  |  13 ++
 .../Maven__xerces_xercesImpl_2_9_1.xml        |  13 ++
 .../Maven__xml_apis_xml_apis_1_0_b2.xml       |  13 ++
 .idea/modules.xml                             |   8 ++
 .idea/uiDesigner.xml                          | 124 ++++++++++++++++++
 .idea/validation.xml                          |  20 +++
 .idea/vcs.xml                                 |   6 +
 407 files changed, 5397 insertions(+), 2 deletions(-)
 create mode 100644 .idea/compiler.xml
 create mode 100644 .idea/encodings.xml
 create mode 100644 .idea/jarRepositories.xml
 create mode 100644 .idea/libraries/Maven__antlr_antlr_2_7_7.xml
 create mode 100644 .idea/libraries/Maven__avalon_framework_avalon_framework_4_1_3.xml
 create mode 100644 .idea/libraries/Maven__backport_util_concurrent_backport_util_concurrent_3_1.xml
 create mode 100644 .idea/libraries/Maven__ch_ethz_ganymed_ganymed_ssh2_build210.xml
 create mode 100644 .idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml
 create mode 100644 .idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml
 create mode 100644 .idea/libraries/Maven__classworlds_classworlds_1_1.xml
 create mode 100644 .idea/libraries/Maven__com_beust_jcommander_1_72.xml
 create mode 100644 .idea/libraries/Maven__com_dkanejs_maven_plugins_docker_compose_maven_plugin_maven_plugin_4_0_0.xml
 create mode 100644 .idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml
 create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_10_3.xml
 create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_10_3.xml
 create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_10_3.xml
 create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_10_3.xml
 create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_10_3.xml
 create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_10_3.xml
 create mode 100644 .idea/libraries/Maven__com_github_mxab_thymeleaf_extras_thymeleaf_extras_data_attribute_2_0_1.xml
 create mode 100644 .idea/libraries/Maven__com_github_spotbugs_spotbugs_4_0_0.xml
 create mode 100644 .idea/libraries/Maven__com_github_spotbugs_spotbugs_annotations_4_0_0.xml
 create mode 100644 .idea/libraries/Maven__com_github_spotbugs_spotbugs_maven_plugin_maven_plugin_4_0_0.xml
 create mode 100644 .idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_2.xml
 create mode 100644 .idea/libraries/Maven__com_google_code_gson_gson_2_8_6.xml
 create mode 100644 .idea/libraries/Maven__com_google_errorprone_error_prone_annotations_2_3_4.xml
 create mode 100644 .idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml
 create mode 100644 .idea/libraries/Maven__com_google_guava_guava_28_2_jre.xml
 create mode 100644 .idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava.xml
 create mode 100644 .idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_3.xml
 create mode 100644 .idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml
 create mode 100644 .idea/libraries/Maven__com_puppycrawl_tools_checkstyle_8_29.xml
 create mode 100644 .idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml
 create mode 100644 .idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_8.xml
 create mode 100644 .idea/libraries/Maven__com_sun_mail_jakarta_mail_1_6_5.xml
 create mode 100644 .idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_1_13.xml
 create mode 100644 .idea/libraries/Maven__com_sun_xml_fastinfoset_FastInfoset_1_2_16.xml
 create mode 100644 .idea/libraries/Maven__com_thoughtworks_qdox_qdox_2_0_M8.xml
 create mode 100644 .idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_all_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_abbreviation_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_admonition_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_anchorlink_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_aside_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_attributes_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_autolink_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_definition_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_emoji_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_enumerated_reference_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_escaped_character_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_footnotes_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gfm_issues_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gfm_strikethrough_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gfm_tables_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gfm_tasklist_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gfm_users_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gitlab_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_ins_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_jekyll_front_matter_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_jekyll_tag_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_macros_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_media_tags_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_superscript_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_tables_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_toc_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_typographic_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_wikilink_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_xwiki_macros_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_yaml_front_matter_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_youtube_embedded_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_formatter_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_html_parser_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_jira_converter_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_profile_pegdown_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_util_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_vladsch_flexmark_flexmark_youtrack_converter_0_42_14.xml
 create mode 100644 .idea/libraries/Maven__com_zaxxer_HikariCP_3_4_2.xml
 create mode 100644 .idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml
 create mode 100644 .idea/libraries/Maven__commons_chain_commons_chain_1_2.xml
 create mode 100644 .idea/libraries/Maven__commons_codec_commons_codec_1_13.xml
 create mode 100644 .idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
 create mode 100644 .idea/libraries/Maven__commons_digester_commons_digester_2_1.xml
 create mode 100644 .idea/libraries/Maven__commons_httpclient_commons_httpclient_3_0_1.xml
 create mode 100644 .idea/libraries/Maven__commons_io_commons_io_2_5.xml
 create mode 100644 .idea/libraries/Maven__commons_lang_commons_lang_2_6.xml
 create mode 100644 .idea/libraries/Maven__commons_logging_commons_logging_1_1.xml
 create mode 100644 .idea/libraries/Maven__commons_validator_commons_validator_1_6.xml
 create mode 100644 .idea/libraries/Maven__dom4j_dom4j_1_1.xml
 create mode 100644 .idea/libraries/Maven__info_picocli_picocli_4_1_4.xml
 create mode 100644 .idea/libraries/Maven__io_github_jpenren_thymeleaf_spring_data_dialect_3_4_0.xml
 create mode 100644 .idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml
 create mode 100644 .idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml
 create mode 100644 .idea/libraries/Maven__jakarta_persistence_jakarta_persistence_api_2_2_3.xml
 create mode 100644 .idea/libraries/Maven__jakarta_transaction_jakarta_transaction_api_1_3_3.xml
 create mode 100644 .idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml
 create mode 100644 .idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml
 create mode 100644 .idea/libraries/Maven__javax_activation_activation_1_1.xml
 create mode 100644 .idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml
 create mode 100644 .idea/libraries/Maven__javax_mail_mail_1_4.xml
 create mode 100644 .idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml
 create mode 100644 .idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml
 create mode 100644 .idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_1.xml
 create mode 100644 .idea/libraries/Maven__jaxen_jaxen_1_2_0.xml
 create mode 100644 .idea/libraries/Maven__jdom_jdom_1_0.xml
 create mode 100644 .idea/libraries/Maven__junit_junit_4_12.xml
 create mode 100644 .idea/libraries/Maven__log4j_log4j_1_2_12.xml
 create mode 100644 .idea/libraries/Maven__logkit_logkit_1_0_1.xml
 create mode 100644 .idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_8.xml
 create mode 100644 .idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_8.xml
 create mode 100644 .idea/libraries/Maven__net_java_dev_javacc_javacc_5_0.xml
 create mode 100644 .idea/libraries/Maven__net_jcip_jcip_annotations_1_0.xml
 create mode 100644 .idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml
 create mode 100644 .idea/libraries/Maven__net_minidev_json_smart_2_3.xml
 create mode 100644 .idea/libraries/Maven__net_sf_saxon_Saxon_HE_9_9_1_6.xml
 create mode 100644 .idea/libraries/Maven__net_sourceforge_pmd_pmd_core_6_21_0.xml
 create mode 100644 .idea/libraries/Maven__net_sourceforge_pmd_pmd_java_6_21_0.xml
 create mode 100644 .idea/libraries/Maven__net_sourceforge_pmd_pmd_javascript_6_21_0.xml
 create mode 100644 .idea/libraries/Maven__net_sourceforge_pmd_pmd_jsp_6_21_0.xml
 create mode 100644 .idea/libraries/Maven__net_sourceforge_saxon_saxon_9_1_0_8.xml
 create mode 100644 .idea/libraries/Maven__net_sourceforge_saxon_saxon_dom_9_1_0_8.xml
 create mode 100644 .idea/libraries/Maven__ognl_ognl_3_1_12.xml
 create mode 100644 .idea/libraries/Maven__org_antlr_antlr4_runtime_4_8_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_ant_ant_1_10_7.xml
 create mode 100644 .idea/libraries/Maven__org_apache_ant_ant_launcher_1_10_7.xml
 create mode 100644 .idea/libraries/Maven__org_apache_bcel_bcel_6_2.xml
 create mode 100644 .idea/libraries/Maven__org_apache_commons_commons_compress_1_20.xml
 create mode 100644 .idea/libraries/Maven__org_apache_commons_commons_lang3_3_9.xml
 create mode 100644 .idea/libraries/Maven__org_apache_cxf_cxf_api_2_6_3.xml
 create mode 100644 .idea/libraries/Maven__org_apache_cxf_cxf_rt_bindings_xml_2_6_3.xml
 create mode 100644 .idea/libraries/Maven__org_apache_cxf_cxf_rt_core_2_6_3.xml
 create mode 100644 .idea/libraries/Maven__org_apache_cxf_cxf_rt_frontend_jaxrs_2_6_3.xml
 create mode 100644 .idea/libraries/Maven__org_apache_cxf_cxf_rt_transports_http_2_6_3.xml
 create mode 100644 .idea/libraries/Maven__org_apache_geronimo_javamail_geronimo_javamail_1_4_mail_1_7.xml
 create mode 100644 .idea/libraries/Maven__org_apache_geronimo_javamail_geronimo_javamail_1_4_provider_1_7.xml
 create mode 100644 .idea/libraries/Maven__org_apache_geronimo_specs_geronimo_javamail_1_4_spec_1_7.xml
 create mode 100644 .idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_12.xml
 create mode 100644 .idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_13.xml
 create mode 100644 .idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_12_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_12_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_doxia_doxia_core_1_9.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_doxia_doxia_decoration_model_1_9_2.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_doxia_doxia_integration_tools_1_9_2.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_doxia_doxia_logging_api_1_7.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_doxia_doxia_module_apt_1_9_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_doxia_doxia_module_confluence_1_9_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_doxia_doxia_module_docbook_simple_1_9_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_doxia_doxia_module_fml_1_9_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_doxia_doxia_module_markdown_1_9_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_doxia_doxia_module_twiki_1_9_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_doxia_doxia_module_xdoc_1_9_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_doxia_doxia_module_xhtml5_1_9_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_doxia_doxia_module_xhtml_1_9_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_doxia_doxia_sink_api_1_7.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_doxia_doxia_site_renderer_1_7_4.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_doxia_doxia_skin_model_1_7_4.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_enforcer_enforcer_api_3_0_0_M3.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_enforcer_enforcer_rules_3_0_0_M3.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_maven_aether_provider_3_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_maven_archiver_3_4_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_maven_artifact_3_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_maven_artifact_manager_2_2_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_maven_compat_3_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_maven_core_3_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_maven_jxr_3_0_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_maven_model_3_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_maven_model_builder_3_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_maven_plugin_api_3_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_maven_plugin_descriptor_2_2_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_maven_plugin_registry_2_2_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_maven_profile_2_2_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_maven_project_2_2_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_maven_repository_metadata_3_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_maven_settings_3_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_maven_settings_builder_3_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_maven_toolchain_2_2_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_plugin_tools_maven_plugin_annotations_3_5_2.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_plugins_maven_changes_plugin_maven_plugin_2_12_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_plugins_maven_checkstyle_plugin_maven_plugin_3_1_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_plugins_maven_clean_plugin_maven_plugin_3_1_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_plugins_maven_compiler_plugin_maven_plugin_3_8_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_plugins_maven_dependency_plugin_maven_plugin_3_1_2.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_plugins_maven_enforcer_plugin_maven_plugin_3_0_0_M3.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_plugins_maven_invoker_plugin_maven_plugin_3_2_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_plugins_maven_jxr_plugin_maven_plugin_3_0_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_plugins_maven_pmd_plugin_maven_plugin_3_13_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_plugins_maven_project_info_reports_plugin_maven_plugin_3_0_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_plugins_maven_site_plugin_maven_plugin_3_9_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_plugins_maven_surefire_plugin_maven_plugin_2_22_2.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_plugins_maven_surefire_report_plugin_maven_plugin_3_0_0_M4.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_reporting_maven_reporting_api_3_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_reporting_maven_reporting_exec_1_4.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_reporting_maven_reporting_impl_2_4.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_resolver_maven_resolver_api_1_4_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_resolver_maven_resolver_util_1_4_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_scm_maven_scm_api_1_10_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_scm_maven_scm_manager_plexus_1_10_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_cvs_commons_1_10_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_cvsexe_1_10_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_cvsjava_1_10_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_git_commons_1_10_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_gitexe_1_10_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_hg_1_10_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_perforce_1_10_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_starteam_1_10_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_svn_commons_1_10_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_svnexe_1_10_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_shared_file_management_3_0_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_shared_maven_artifact_transfer_0_11_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_shared_maven_common_artifact_filters_3_1_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_shared_maven_dependency_analyzer_1_11_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_shared_maven_dependency_tree_3_0_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_shared_maven_filtering_1_3.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_shared_maven_invoker_3_0_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_shared_maven_script_interpreter_1_2.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_shared_maven_shared_incremental_1_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_shared_maven_shared_io_3_0_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_shared_maven_shared_jar_1_2.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_shared_maven_shared_utils_3_2_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_surefire_maven_surefire_common_2_22_2.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_surefire_surefire_api_2_22_2.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_surefire_surefire_booter_2_22_2.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_surefire_surefire_logger_api_3_0_0_M4.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_surefire_surefire_report_parser_3_0_0_M4.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_wagon_wagon_http_lightweight_3_1_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_wagon_wagon_http_shared_3_1_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_maven_wagon_wagon_provider_api_3_3_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_struts_struts_core_1_3_8.xml
 create mode 100644 .idea/libraries/Maven__org_apache_struts_struts_taglib_1_3_8.xml
 create mode 100644 .idea/libraries/Maven__org_apache_struts_struts_tiles_1_3_8.xml
 create mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_33.xml
 create mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_33.xml
 create mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_33.xml
 create mode 100644 .idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml
 create mode 100644 .idea/libraries/Maven__org_apache_velocity_velocity_tools_2_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_ws_commons_ws_commons_util_1_0_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_ws_xmlschema_xmlschema_core_2_0_3.xml
 create mode 100644 .idea/libraries/Maven__org_apache_xbean_xbean_reflect_3_7.xml
 create mode 100644 .idea/libraries/Maven__org_apache_xmlrpc_xmlrpc_client_3_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_xmlrpc_xmlrpc_common_3_0.xml
 create mode 100644 .idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml
 create mode 100644 .idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_5.xml
 create mode 100644 .idea/libraries/Maven__org_assertj_assertj_core_3_13_2.xml
 create mode 100644 .idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml
 create mode 100644 .idea/libraries/Maven__org_checkerframework_checker_qual_2_10_0.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_groovy_groovy_2_5_10.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_groovy_groovy_all_2_4_8.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_groovy_groovy_ant_indy_3_0_2.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_groovy_groovy_cli_picocli_2_5_10.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_groovy_groovy_dateutil_indy_3_0_2.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_groovy_groovy_docgenerator_2_5_10.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_groovy_groovy_groovydoc_2_5_10.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_groovy_groovy_indy_3_0_2.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_groovy_groovy_templates_2_5_10.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_groovy_groovy_xml_2_5_10.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_plexus_plexus_archiver_4_2_2.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_plexus_plexus_classworlds_2_5_2.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_plexus_plexus_compiler_api_2_8_4.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_plexus_plexus_compiler_javac_2_8_4.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_plexus_plexus_compiler_manager_2_8_4.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_plexus_plexus_component_annotations_2_0_0.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_plexus_plexus_container_default_2_1_0.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_plexus_plexus_digest_1_0.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_plexus_plexus_i18n_1_0_beta_7.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_plexus_plexus_interpolation_1_26.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_plexus_plexus_io_3_2_0.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_plexus_plexus_java_0_9_10.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_plexus_plexus_mail_sender_api_1_0_alpha_7.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_plexus_plexus_mail_sender_javamail_1_0_alpha_7.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_plexus_plexus_mail_sender_simple_1_0_alpha_7.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_plexus_plexus_resources_1_1_0.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_plexus_plexus_utils_3_3_0.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_plexus_plexus_velocity_1_2.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_1.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_1_4.xml
 create mode 100644 .idea/libraries/Maven__org_dom4j_dom4j_2_1_1.xml
 create mode 100644 .idea/libraries/Maven__org_eclipse_aether_aether_util_0_9_0_M2.xml
 create mode 100644 .idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_4_27_v20200227.xml
 create mode 100644 .idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_4_27_v20200227.xml
 create mode 100644 .idea/libraries/Maven__org_eclipse_jetty_jetty_security_9_4_27_v20200227.xml
 create mode 100644 .idea/libraries/Maven__org_eclipse_jetty_jetty_server_9_4_27_v20200227.xml
 create mode 100644 .idea/libraries/Maven__org_eclipse_jetty_jetty_servlet_9_4_27_v20200227.xml
 create mode 100644 .idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_4_27_v20200227.xml
 create mode 100644 .idea/libraries/Maven__org_eclipse_jetty_jetty_webapp_9_4_27_v20200227.xml
 create mode 100644 .idea/libraries/Maven__org_eclipse_jetty_jetty_xml_9_4_27_v20200227.xml
 create mode 100644 .idea/libraries/Maven__org_eclipse_mylyn_github_org_eclipse_egit_github_core_2_1_5.xml
 create mode 100644 .idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_2.xml
 create mode 100644 .idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_2.xml
 create mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_2_1.xml
 create mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_core_2_1.xml
 create mode 100644 .idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_1_0_Final.xml
 create mode 100644 .idea/libraries/Maven__org_hibernate_hibernate_core_5_4_12_Final.xml
 create mode 100644 .idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_18_Final.xml
 create mode 100644 .idea/libraries/Maven__org_iq80_snappy_snappy_0_4.xml
 create mode 100644 .idea/libraries/Maven__org_javassist_javassist_3_24_0_GA.xml
 create mode 100644 .idea/libraries/Maven__org_jboss_jandex_2_1_1_Final.xml
 create mode 100644 .idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml
 create mode 100644 .idea/libraries/Maven__org_jsoup_jsoup_1_8_3.xml
 create mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_5_2.xml
 create mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_5_2.xml
 create mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_5_2.xml
 create mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_5_2.xml
 create mode 100644 .idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_5_2.xml
 create mode 100644 .idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_5_2.xml
 create mode 100644 .idea/libraries/Maven__org_jvnet_staxex_stax_ex_1_8_1.xml
 create mode 100644 .idea/libraries/Maven__org_mockito_mockito_core_3_1_0.xml
 create mode 100644 .idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_1_0.xml
 create mode 100644 .idea/libraries/Maven__org_mozilla_rhino_1_7_7_2.xml
 create mode 100644 .idea/libraries/Maven__org_netbeans_lib_cvsclient_20060125.xml
 create mode 100644 .idea/libraries/Maven__org_nibor_autolink_autolink_0_6_0.xml
 create mode 100644 .idea/libraries/Maven__org_objenesis_objenesis_2_6.xml
 create mode 100644 .idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml
 create mode 100644 .idea/libraries/Maven__org_ow2_asm_asm_7_3_1.xml
 create mode 100644 .idea/libraries/Maven__org_ow2_asm_asm_analysis_7_3_1.xml
 create mode 100644 .idea/libraries/Maven__org_ow2_asm_asm_commons_7_3_1.xml
 create mode 100644 .idea/libraries/Maven__org_ow2_asm_asm_tree_7_3_1.xml
 create mode 100644 .idea/libraries/Maven__org_ow2_asm_asm_util_7_3_1.xml
 create mode 100644 .idea/libraries/Maven__org_postgresql_postgresql_42_2_11.xml
 create mode 100644 .idea/libraries/Maven__org_projectlombok_lombok_1_18_12.xml
 create mode 100644 .idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml
 create mode 100644 .idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml
 create mode 100644 .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml
 create mode 100644 .idea/libraries/Maven__org_slf4j_slf4j_simple_1_7_30.xml
 create mode 100644 .idea/libraries/Maven__org_sonatype_aether_aether_api_1_7.xml
 create mode 100644 .idea/libraries/Maven__org_sonatype_aether_aether_impl_1_7.xml
 create mode 100644 .idea/libraries/Maven__org_sonatype_aether_aether_spi_1_7.xml
 create mode 100644 .idea/libraries/Maven__org_sonatype_aether_aether_util_1_7.xml
 create mode 100644 .idea/libraries/Maven__org_sonatype_plexus_plexus_build_api_0_0_7.xml
 create mode 100644 .idea/libraries/Maven__org_sonatype_plexus_plexus_cipher_1_4.xml
 create mode 100644 .idea/libraries/Maven__org_sonatype_plexus_plexus_sec_dispatcher_1_3.xml
 create mode 100644 .idea/libraries/Maven__org_sonatype_sisu_sisu_guice_noaop_2_1_7.xml
 create mode 100644 .idea/libraries/Maven__org_sonatype_sisu_sisu_inject_bean_1_4_2.xml
 create mode 100644 .idea/libraries/Maven__org_sonatype_sisu_sisu_inject_plexus_1_4_2.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_2_2_6_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_2_6_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_metadata_2_2_6_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_processor_2_2_6_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_2_6_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_loader_tools_2_2_6_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_maven_plugin_maven_plugin_2_2_6_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_properties_migrator_2_2_6_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_2_6_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_2_6_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_2_6_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_2_6_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_2_6_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_2_6_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_mail_2_2_6_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_2_2_6_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_2_6_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_2_6_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_2_6_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_2_6_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_2_6_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_2_6_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_2_6_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_commons_2_2_6_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_2_6_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_security_spring_security_config_5_2_2_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_security_spring_security_core_5_2_2_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_security_spring_security_data_5_2_2_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_security_spring_security_remoting_5_2_2_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_security_spring_security_test_5_2_2_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_security_spring_security_web_5_2_2_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_session_spring_session_core_2_2_2_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_session_spring_session_jdbc_2_2_2_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_aop_5_2_5_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_aspects_5_2_5_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_beans_5_2_5_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_context_5_2_5_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_context_support_5_2_5_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_core_5_2_5_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_expression_5_2_5_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_jcl_5_2_5_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_jdbc_5_2_5_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_orm_5_2_5_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_test_5_2_5_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_tx_5_2_5_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_web_5_2_5_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_webmvc_5_2_5_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_4_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_springsecurity5_3_0_4_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_11_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_11_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_thymeleaf_thymeleaf_testing_3_0_4_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_tukaani_xz_1_8.xml
 create mode 100644 .idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_webjars_bootstrap_4_4_1_1.xml
 create mode 100644 .idea/libraries/Maven__org_webjars_ckeditor_4_14_0.xml
 create mode 100644 .idea/libraries/Maven__org_webjars_font_awesome_5_13_0.xml
 create mode 100644 .idea/libraries/Maven__org_webjars_jquery_3_4_1.xml
 create mode 100644 .idea/libraries/Maven__org_webjars_popper_js_1_14_3.xml
 create mode 100644 .idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_4.xml
 create mode 100644 .idea/libraries/Maven__org_yaml_snakeyaml_1_25.xml
 create mode 100644 .idea/libraries/Maven__oro_oro_2_0_8.xml
 create mode 100644 .idea/libraries/Maven__rome_rome_1_0.xml
 create mode 100644 .idea/libraries/Maven__sslext_sslext_1_2_0.xml
 create mode 100644 .idea/libraries/Maven__wsdl4j_wsdl4j_1_6_3.xml
 create mode 100644 .idea/libraries/Maven__xalan_xalan_2_7_0.xml
 create mode 100644 .idea/libraries/Maven__xerces_xercesImpl_2_9_1.xml
 create mode 100644 .idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/uiDesigner.xml
 create mode 100644 .idea/validation.xml
 create mode 100644 .idea/vcs.xml

diff --git a/.gitignore b/.gitignore
index 62a80353..2ed5f32f 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
@@ -35,3 +35,5 @@ setenv.cmd
 /src/main/java/org/woehlke/simpleworklist/context/x.txt
 /src/main/java/org/woehlke/simpleworklist/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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="simpleworklist" />
+      </profile>
+    </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="simpleworklist" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+  <component name="JavacSettings">
+    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
+      <module name="simpleworklist" options="-parameters -Xlint:all,-options,-path" />
+    </option>
+  </component>
+</project>
\ 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+  </component>
+</project>
\ 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+  </component>
+</project>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: antlr:antlr:2.7.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/antlr/antlr/2.7.7/antlr-2.7.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/antlr/antlr/2.7.7/antlr-2.7.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/antlr/antlr/2.7.7/antlr-2.7.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: avalon-framework:avalon-framework:4.1.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: backport-util-concurrent:backport-util-concurrent:3.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: ch.ethz.ganymed:ganymed-ssh2:build210">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: ch.qos.logback:logback-classic:1.2.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: ch.qos.logback:logback-core:1.2.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: classworlds:classworlds:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/classworlds/classworlds/1.1/classworlds-1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/classworlds/classworlds/1.1/classworlds-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/classworlds/classworlds/1.1/classworlds-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.beust:jcommander:1.72">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/beust/jcommander/1.72/jcommander-1.72.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/beust/jcommander/1.72/jcommander-1.72-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/beust/jcommander/1.72/jcommander-1.72-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.dkanejs.maven.plugins:docker-compose-maven-plugin:maven-plugin:4.0.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/dkanejs/maven/plugins/docker-compose-maven-plugin/4.0.0/docker-compose-maven-plugin-4.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/dkanejs/maven/plugins/docker-compose-maven-plugin/4.0.0/docker-compose-maven-plugin-4.0.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/dkanejs/maven/plugins/docker-compose-maven-plugin/4.0.0/docker-compose-maven-plugin-4.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml:classmate:1.5.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.5.1/classmate-1.5.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.5.1/classmate-1.5.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.5.1/classmate-1.5.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.10.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.10.3/jackson-annotations-2.10.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.10.3/jackson-annotations-2.10.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.10.3/jackson-annotations-2.10.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.10.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.10.3/jackson-core-2.10.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.10.3/jackson-core-2.10.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.10.3/jackson-core-2.10.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.10.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.10.3/jackson-databind-2.10.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.10.3/jackson-databind-2.10.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.10.3/jackson-databind-2.10.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.10.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.10.3/jackson-datatype-jdk8-2.10.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.10.3/jackson-datatype-jdk8-2.10.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.10.3/jackson-datatype-jdk8-2.10.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.10.3/jackson-datatype-jsr310-2.10.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.10.3/jackson-datatype-jsr310-2.10.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.10.3/jackson-datatype-jsr310-2.10.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.10.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.10.3/jackson-module-parameter-names-2.10.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.10.3/jackson-module-parameter-names-2.10.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.10.3/jackson-module-parameter-names-2.10.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.mxab.thymeleaf.extras:thymeleaf-extras-data-attribute:2.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/mxab/thymeleaf/extras/thymeleaf-extras-data-attribute/2.0.1/thymeleaf-extras-data-attribute-2.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/mxab/thymeleaf/extras/thymeleaf-extras-data-attribute/2.0.1/thymeleaf-extras-data-attribute-2.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/mxab/thymeleaf/extras/thymeleaf-extras-data-attribute/2.0.1/thymeleaf-extras-data-attribute-2.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.spotbugs:spotbugs:4.0.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/spotbugs/spotbugs/4.0.0/spotbugs-4.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/spotbugs/spotbugs/4.0.0/spotbugs-4.0.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/spotbugs/spotbugs/4.0.0/spotbugs-4.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.spotbugs:spotbugs-annotations:4.0.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/spotbugs/spotbugs-annotations/4.0.0/spotbugs-annotations-4.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/spotbugs/spotbugs-annotations/4.0.0/spotbugs-annotations-4.0.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/spotbugs/spotbugs-annotations/4.0.0/spotbugs-annotations-4.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.spotbugs:spotbugs-maven-plugin:maven-plugin:4.0.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/spotbugs/spotbugs-maven-plugin/4.0.0/spotbugs-maven-plugin-4.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/spotbugs/spotbugs-maven-plugin/4.0.0/spotbugs-maven-plugin-4.0.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/spotbugs/spotbugs-maven-plugin/4.0.0/spotbugs-maven-plugin-4.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.code.findbugs:jsr305:3.0.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.code.gson:gson:2.8.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.8.6/gson-2.8.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.8.6/gson-2.8.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.8.6/gson-2.8.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.errorprone:error_prone_annotations:2.3.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.guava:failureaccess:1.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.guava:guava:28.2-jre">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/28.2-jre/guava-28.2-jre.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/28.2-jre/guava-28.2-jre-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/28.2-jre/guava-28.2-jre-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.j2objc:j2objc-annotations:1.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.jayway.jsonpath:json-path:2.4.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.puppycrawl.tools:checkstyle:8.29">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/puppycrawl/tools/checkstyle/8.29/checkstyle-8.29.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/puppycrawl/tools/checkstyle/8.29/checkstyle-8.29-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/puppycrawl/tools/checkstyle/8.29/checkstyle-8.29-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.sun.activation:jakarta.activation:1.2.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/activation/jakarta.activation/1.2.2/jakarta.activation-1.2.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/activation/jakarta.activation/1.2.2/jakarta.activation-1.2.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/activation/jakarta.activation/1.2.2/jakarta.activation-1.2.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.sun.istack:istack-commons-runtime:3.0.8">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/istack/istack-commons-runtime/3.0.8/istack-commons-runtime-3.0.8.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/istack/istack-commons-runtime/3.0.8/istack-commons-runtime-3.0.8-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/istack/istack-commons-runtime/3.0.8/istack-commons-runtime-3.0.8-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.sun.mail:jakarta.mail:1.6.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/mail/jakarta.mail/1.6.5/jakarta.mail-1.6.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/mail/jakarta.mail/1.6.5/jakarta.mail-1.6.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/mail/jakarta.mail/1.6.5/jakarta.mail-1.6.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.sun.xml.bind:jaxb-impl:2.1.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/xml/bind/jaxb-impl/2.1.13/jaxb-impl-2.1.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/xml/bind/jaxb-impl/2.1.13/jaxb-impl-2.1.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/xml/bind/jaxb-impl/2.1.13/jaxb-impl-2.1.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.sun.xml.fastinfoset:FastInfoset:1.2.16">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/xml/fastinfoset/FastInfoset/1.2.16/FastInfoset-1.2.16.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/xml/fastinfoset/FastInfoset/1.2.16/FastInfoset-1.2.16-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/xml/fastinfoset/FastInfoset/1.2.16/FastInfoset-1.2.16-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.thoughtworks.qdox:qdox:2.0-M8">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/thoughtworks/qdox/qdox/2.0-M8/qdox-2.0-M8.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/thoughtworks/qdox/qdox/2.0-M8/qdox-2.0-M8-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/thoughtworks/qdox/qdox/2.0-M8/qdox-2.0-M8-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark/0.42.14/flexmark-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark/0.42.14/flexmark-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark/0.42.14/flexmark-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-all:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-all/0.42.14/flexmark-all-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-all/0.42.14/flexmark-all-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-all/0.42.14/flexmark-all-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-abbreviation:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-abbreviation/0.42.14/flexmark-ext-abbreviation-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-abbreviation/0.42.14/flexmark-ext-abbreviation-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-abbreviation/0.42.14/flexmark-ext-abbreviation-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-admonition:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-admonition/0.42.14/flexmark-ext-admonition-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-admonition/0.42.14/flexmark-ext-admonition-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-admonition/0.42.14/flexmark-ext-admonition-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-anchorlink:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-anchorlink/0.42.14/flexmark-ext-anchorlink-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-anchorlink/0.42.14/flexmark-ext-anchorlink-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-anchorlink/0.42.14/flexmark-ext-anchorlink-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-aside:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-aside/0.42.14/flexmark-ext-aside-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-aside/0.42.14/flexmark-ext-aside-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-aside/0.42.14/flexmark-ext-aside-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-attributes:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-attributes/0.42.14/flexmark-ext-attributes-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-attributes/0.42.14/flexmark-ext-attributes-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-attributes/0.42.14/flexmark-ext-attributes-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-autolink:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-autolink/0.42.14/flexmark-ext-autolink-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-autolink/0.42.14/flexmark-ext-autolink-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-autolink/0.42.14/flexmark-ext-autolink-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-definition:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-definition/0.42.14/flexmark-ext-definition-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-definition/0.42.14/flexmark-ext-definition-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-definition/0.42.14/flexmark-ext-definition-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-emoji:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-emoji/0.42.14/flexmark-ext-emoji-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-emoji/0.42.14/flexmark-ext-emoji-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-emoji/0.42.14/flexmark-ext-emoji-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-enumerated-reference:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-enumerated-reference/0.42.14/flexmark-ext-enumerated-reference-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-enumerated-reference/0.42.14/flexmark-ext-enumerated-reference-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-enumerated-reference/0.42.14/flexmark-ext-enumerated-reference-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-escaped-character:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-escaped-character/0.42.14/flexmark-ext-escaped-character-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-escaped-character/0.42.14/flexmark-ext-escaped-character-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-escaped-character/0.42.14/flexmark-ext-escaped-character-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-footnotes:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-footnotes/0.42.14/flexmark-ext-footnotes-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-footnotes/0.42.14/flexmark-ext-footnotes-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-footnotes/0.42.14/flexmark-ext-footnotes-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-gfm-issues:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-gfm-issues/0.42.14/flexmark-ext-gfm-issues-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-gfm-issues/0.42.14/flexmark-ext-gfm-issues-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-gfm-issues/0.42.14/flexmark-ext-gfm-issues-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-gfm-strikethrough/0.42.14/flexmark-ext-gfm-strikethrough-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-gfm-strikethrough/0.42.14/flexmark-ext-gfm-strikethrough-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-gfm-strikethrough/0.42.14/flexmark-ext-gfm-strikethrough-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-gfm-tables:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-gfm-tables/0.42.14/flexmark-ext-gfm-tables-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-gfm-tables/0.42.14/flexmark-ext-gfm-tables-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-gfm-tables/0.42.14/flexmark-ext-gfm-tables-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-gfm-tasklist:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-gfm-tasklist/0.42.14/flexmark-ext-gfm-tasklist-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-gfm-tasklist/0.42.14/flexmark-ext-gfm-tasklist-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-gfm-tasklist/0.42.14/flexmark-ext-gfm-tasklist-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-gfm-users:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-gfm-users/0.42.14/flexmark-ext-gfm-users-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-gfm-users/0.42.14/flexmark-ext-gfm-users-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-gfm-users/0.42.14/flexmark-ext-gfm-users-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-gitlab:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-gitlab/0.42.14/flexmark-ext-gitlab-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-gitlab/0.42.14/flexmark-ext-gitlab-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-gitlab/0.42.14/flexmark-ext-gitlab-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-ins:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-ins/0.42.14/flexmark-ext-ins-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-ins/0.42.14/flexmark-ext-ins-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-ins/0.42.14/flexmark-ext-ins-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-jekyll-front-matter:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-jekyll-front-matter/0.42.14/flexmark-ext-jekyll-front-matter-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-jekyll-front-matter/0.42.14/flexmark-ext-jekyll-front-matter-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-jekyll-front-matter/0.42.14/flexmark-ext-jekyll-front-matter-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-jekyll-tag:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-jekyll-tag/0.42.14/flexmark-ext-jekyll-tag-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-jekyll-tag/0.42.14/flexmark-ext-jekyll-tag-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-jekyll-tag/0.42.14/flexmark-ext-jekyll-tag-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-macros:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-macros/0.42.14/flexmark-ext-macros-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-macros/0.42.14/flexmark-ext-macros-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-macros/0.42.14/flexmark-ext-macros-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-media-tags:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-media-tags/0.42.14/flexmark-ext-media-tags-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-media-tags/0.42.14/flexmark-ext-media-tags-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-media-tags/0.42.14/flexmark-ext-media-tags-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-superscript:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-superscript/0.42.14/flexmark-ext-superscript-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-superscript/0.42.14/flexmark-ext-superscript-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-superscript/0.42.14/flexmark-ext-superscript-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-tables:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-tables/0.42.14/flexmark-ext-tables-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-tables/0.42.14/flexmark-ext-tables-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-tables/0.42.14/flexmark-ext-tables-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-toc:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-toc/0.42.14/flexmark-ext-toc-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-toc/0.42.14/flexmark-ext-toc-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-toc/0.42.14/flexmark-ext-toc-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-typographic:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-typographic/0.42.14/flexmark-ext-typographic-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-typographic/0.42.14/flexmark-ext-typographic-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-typographic/0.42.14/flexmark-ext-typographic-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-wikilink:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-wikilink/0.42.14/flexmark-ext-wikilink-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-wikilink/0.42.14/flexmark-ext-wikilink-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-wikilink/0.42.14/flexmark-ext-wikilink-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-xwiki-macros:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-xwiki-macros/0.42.14/flexmark-ext-xwiki-macros-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-xwiki-macros/0.42.14/flexmark-ext-xwiki-macros-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-xwiki-macros/0.42.14/flexmark-ext-xwiki-macros-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-yaml-front-matter:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-yaml-front-matter/0.42.14/flexmark-ext-yaml-front-matter-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-yaml-front-matter/0.42.14/flexmark-ext-yaml-front-matter-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-yaml-front-matter/0.42.14/flexmark-ext-yaml-front-matter-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-ext-youtube-embedded:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-youtube-embedded/0.42.14/flexmark-ext-youtube-embedded-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-youtube-embedded/0.42.14/flexmark-ext-youtube-embedded-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-ext-youtube-embedded/0.42.14/flexmark-ext-youtube-embedded-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-formatter:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-formatter/0.42.14/flexmark-formatter-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-formatter/0.42.14/flexmark-formatter-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-formatter/0.42.14/flexmark-formatter-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-html-parser:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-html-parser/0.42.14/flexmark-html-parser-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-html-parser/0.42.14/flexmark-html-parser-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-html-parser/0.42.14/flexmark-html-parser-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-jira-converter:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-jira-converter/0.42.14/flexmark-jira-converter-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-jira-converter/0.42.14/flexmark-jira-converter-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-jira-converter/0.42.14/flexmark-jira-converter-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-profile-pegdown:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-profile-pegdown/0.42.14/flexmark-profile-pegdown-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-profile-pegdown/0.42.14/flexmark-profile-pegdown-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-profile-pegdown/0.42.14/flexmark-profile-pegdown-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-util:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-util/0.42.14/flexmark-util-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-util/0.42.14/flexmark-util-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-util/0.42.14/flexmark-util-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vladsch.flexmark:flexmark-youtrack-converter:0.42.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-youtrack-converter/0.42.14/flexmark-youtrack-converter-0.42.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-youtrack-converter/0.42.14/flexmark-youtrack-converter-0.42.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vladsch/flexmark/flexmark-youtrack-converter/0.42.14/flexmark-youtrack-converter-0.42.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.zaxxer:HikariCP:3.4.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/3.4.2/HikariCP-3.4.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/3.4.2/HikariCP-3.4.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/3.4.2/HikariCP-3.4.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: commons-beanutils:commons-beanutils:1.9.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.9.4/commons-beanutils-1.9.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.9.4/commons-beanutils-1.9.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.9.4/commons-beanutils-1.9.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: commons-chain:commons-chain:1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-chain/commons-chain/1.2/commons-chain-1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-chain/commons-chain/1.2/commons-chain-1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-chain/commons-chain/1.2/commons-chain-1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: commons-codec:commons-codec:1.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.13/commons-codec-1.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.13/commons-codec-1.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.13/commons-codec-1.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: commons-collections:commons-collections:3.2.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: commons-digester:commons-digester:2.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-digester/commons-digester/2.1/commons-digester-2.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-digester/commons-digester/2.1/commons-digester-2.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-digester/commons-digester/2.1/commons-digester-2.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: commons-httpclient:commons-httpclient:3.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: commons-io:commons-io:2.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.5/commons-io-2.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.5/commons-io-2.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.5/commons-io-2.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: commons-lang:commons-lang:2.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.6/commons-lang-2.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.6/commons-lang-2.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.6/commons-lang-2.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: commons-logging:commons-logging:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1/commons-logging-1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1/commons-logging-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: commons-validator:commons-validator:1.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-validator/commons-validator/1.6/commons-validator-1.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-validator/commons-validator/1.6/commons-validator-1.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-validator/commons-validator/1.6/commons-validator-1.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: dom4j:dom4j:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.1/dom4j-1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.1/dom4j-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/dom4j/dom4j/1.1/dom4j-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: info.picocli:picocli:4.1.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/info/picocli/picocli/4.1.4/picocli-4.1.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/info/picocli/picocli/4.1.4/picocli-4.1.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/info/picocli/picocli/4.1.4/picocli-4.1.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: io.github.jpenren:thymeleaf-spring-data-dialect:3.4.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/jpenren/thymeleaf-spring-data-dialect/3.4.0/thymeleaf-spring-data-dialect-3.4.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/jpenren/thymeleaf-spring-data-dialect/3.4.0/thymeleaf-spring-data-dialect-3.4.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/jpenren/thymeleaf-spring-data-dialect/3.4.0/thymeleaf-spring-data-dialect-3.4.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: jakarta.activation:jakarta.activation-api:1.2.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: jakarta.persistence:jakarta.persistence-api:2.2.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/persistence/jakarta.persistence-api/2.2.3/jakarta.persistence-api-2.2.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/persistence/jakarta.persistence-api/2.2.3/jakarta.persistence-api-2.2.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/persistence/jakarta.persistence-api/2.2.3/jakarta.persistence-api-2.2.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: jakarta.transaction:jakarta.transaction-api:1.3.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/transaction/jakarta.transaction-api/1.3.3/jakarta.transaction-api-1.3.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/transaction/jakarta.transaction-api/1.3.3/jakarta.transaction-api-1.3.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/transaction/jakarta.transaction-api/1.3.3/jakarta.transaction-api-1.3.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: jakarta.validation:jakarta.validation-api:2.0.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: javax.activation:activation:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: javax.activation:javax.activation-api:1.2.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: javax.mail:mail:1.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4/mail-1.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4/mail-1.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4/mail-1.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: javax.servlet:javax.servlet-api:4.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/javax.servlet-api/4.0.1/javax.servlet-api-4.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/javax.servlet-api/4.0.1/javax.servlet-api-4.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/javax.servlet-api/4.0.1/javax.servlet-api-4.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: javax.ws.rs:jsr311-api:1.1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: javax.xml.bind:jaxb-api:2.3.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: jaxen:jaxen:1.2.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/jaxen/jaxen/1.2.0/jaxen-1.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/jaxen/jaxen/1.2.0/jaxen-1.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/jaxen/jaxen/1.2.0/jaxen-1.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: jdom:jdom:1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/jdom/jdom/1.0/jdom-1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/jdom/jdom/1.0/jdom-1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/jdom/jdom/1.0/jdom-1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: junit:junit:4.12">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: log4j:log4j:1.2.12">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.12/log4j-1.2.12.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.12/log4j-1.2.12-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.12/log4j-1.2.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: logkit:logkit:1.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/logkit/logkit/1.0.1/logkit-1.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/logkit/logkit/1.0.1/logkit-1.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/logkit/logkit/1.0.1/logkit-1.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: net.bytebuddy:byte-buddy:1.10.8">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.10.8/byte-buddy-1.10.8.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.10.8/byte-buddy-1.10.8-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.10.8/byte-buddy-1.10.8-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: net.bytebuddy:byte-buddy-agent:1.10.8">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.10.8/byte-buddy-agent-1.10.8.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.10.8/byte-buddy-agent-1.10.8-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.10.8/byte-buddy-agent-1.10.8-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: net.java.dev.javacc:javacc:5.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/java/dev/javacc/javacc/5.0/javacc-5.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/java/dev/javacc/javacc/5.0/javacc-5.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/java/dev/javacc/javacc/5.0/javacc-5.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: net.jcip:jcip-annotations:1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: net.minidev:accessors-smart:1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/accessors-smart/1.2/accessors-smart-1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/accessors-smart/1.2/accessors-smart-1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/accessors-smart/1.2/accessors-smart-1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: net.minidev:json-smart:2.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/json-smart/2.3/json-smart-2.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/json-smart/2.3/json-smart-2.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/json-smart/2.3/json-smart-2.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: net.sf.saxon:Saxon-HE:9.9.1-6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sf/saxon/Saxon-HE/9.9.1-6/Saxon-HE-9.9.1-6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sf/saxon/Saxon-HE/9.9.1-6/Saxon-HE-9.9.1-6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sf/saxon/Saxon-HE/9.9.1-6/Saxon-HE-9.9.1-6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: net.sourceforge.pmd:pmd-core:6.21.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/pmd/pmd-core/6.21.0/pmd-core-6.21.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/pmd/pmd-core/6.21.0/pmd-core-6.21.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/pmd/pmd-core/6.21.0/pmd-core-6.21.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: net.sourceforge.pmd:pmd-java:6.21.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/pmd/pmd-java/6.21.0/pmd-java-6.21.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/pmd/pmd-java/6.21.0/pmd-java-6.21.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/pmd/pmd-java/6.21.0/pmd-java-6.21.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: net.sourceforge.pmd:pmd-javascript:6.21.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/pmd/pmd-javascript/6.21.0/pmd-javascript-6.21.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/pmd/pmd-javascript/6.21.0/pmd-javascript-6.21.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/pmd/pmd-javascript/6.21.0/pmd-javascript-6.21.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: net.sourceforge.pmd:pmd-jsp:6.21.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/pmd/pmd-jsp/6.21.0/pmd-jsp-6.21.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/pmd/pmd-jsp/6.21.0/pmd-jsp-6.21.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/pmd/pmd-jsp/6.21.0/pmd-jsp-6.21.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: net.sourceforge.saxon:saxon:9.1.0.8">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/saxon/saxon/9.1.0.8/saxon-9.1.0.8.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/saxon/saxon/9.1.0.8/saxon-9.1.0.8-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/saxon/saxon/9.1.0.8/saxon-9.1.0.8-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: net.sourceforge.saxon:saxon:dom:9.1.0.8">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/saxon/saxon/9.1.0.8/saxon-9.1.0.8-dom.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/saxon/saxon/9.1.0.8/saxon-9.1.0.8-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/saxon/saxon/9.1.0.8/saxon-9.1.0.8-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: ognl:ognl:3.1.12">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/ognl/ognl/3.1.12/ognl-3.1.12.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/ognl/ognl/3.1.12/ognl-3.1.12-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/ognl/ognl/3.1.12/ognl-3.1.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.antlr:antlr4-runtime:4.8-1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.8-1/antlr4-runtime-4.8-1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.8-1/antlr4-runtime-4.8-1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.8-1/antlr4-runtime-4.8-1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.ant:ant:1.10.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant/1.10.7/ant-1.10.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant/1.10.7/ant-1.10.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant/1.10.7/ant-1.10.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.ant:ant-launcher:1.10.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant-launcher/1.10.7/ant-launcher-1.10.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant-launcher/1.10.7/ant-launcher-1.10.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant-launcher/1.10.7/ant-launcher-1.10.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.bcel:bcel:6.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/bcel/bcel/6.2/bcel-6.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/bcel/bcel/6.2/bcel-6.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/bcel/bcel/6.2/bcel-6.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.commons:commons-compress:1.20">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-compress/1.20/commons-compress-1.20.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-compress/1.20/commons-compress-1.20-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-compress/1.20/commons-compress-1.20-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.commons:commons-lang3:3.9">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.9/commons-lang3-3.9.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.9/commons-lang3-3.9-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.9/commons-lang3-3.9-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.cxf:cxf-api:2.6.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/cxf/cxf-api/2.6.3/cxf-api-2.6.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/cxf/cxf-api/2.6.3/cxf-api-2.6.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/cxf/cxf-api/2.6.3/cxf-api-2.6.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.cxf:cxf-rt-bindings-xml:2.6.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/cxf/cxf-rt-bindings-xml/2.6.3/cxf-rt-bindings-xml-2.6.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/cxf/cxf-rt-bindings-xml/2.6.3/cxf-rt-bindings-xml-2.6.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/cxf/cxf-rt-bindings-xml/2.6.3/cxf-rt-bindings-xml-2.6.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.cxf:cxf-rt-core:2.6.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/cxf/cxf-rt-core/2.6.3/cxf-rt-core-2.6.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/cxf/cxf-rt-core/2.6.3/cxf-rt-core-2.6.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/cxf/cxf-rt-core/2.6.3/cxf-rt-core-2.6.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.cxf:cxf-rt-frontend-jaxrs:2.6.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/cxf/cxf-rt-frontend-jaxrs/2.6.3/cxf-rt-frontend-jaxrs-2.6.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/cxf/cxf-rt-frontend-jaxrs/2.6.3/cxf-rt-frontend-jaxrs-2.6.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/cxf/cxf-rt-frontend-jaxrs/2.6.3/cxf-rt-frontend-jaxrs-2.6.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.cxf:cxf-rt-transports-http:2.6.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/cxf/cxf-rt-transports-http/2.6.3/cxf-rt-transports-http-2.6.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/cxf/cxf-rt-transports-http/2.6.3/cxf-rt-transports-http-2.6.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/cxf/cxf-rt-transports-http/2.6.3/cxf-rt-transports-http-2.6.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.geronimo.javamail:geronimo-javamail_1.4_mail:1.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/geronimo/javamail/geronimo-javamail_1.4_mail/1.7/geronimo-javamail_1.4_mail-1.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/geronimo/javamail/geronimo-javamail_1.4_mail/1.7/geronimo-javamail_1.4_mail-1.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/geronimo/javamail/geronimo-javamail_1.4_mail/1.7/geronimo-javamail_1.4_mail-1.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.geronimo.javamail:geronimo-javamail_1.4_provider:1.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/geronimo/javamail/geronimo-javamail_1.4_provider/1.7/geronimo-javamail_1.4_provider-1.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/geronimo/javamail/geronimo-javamail_1.4_provider/1.7/geronimo-javamail_1.4_provider-1.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/geronimo/javamail/geronimo-javamail_1.4_provider/1.7/geronimo-javamail_1.4_provider-1.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.geronimo.specs:geronimo-javamail_1.4_spec:1.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.7/geronimo-javamail_1.4_spec-1.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.7/geronimo-javamail_1.4_spec-1.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.7/geronimo-javamail_1.4_spec-1.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.httpcomponents:httpclient:4.5.12">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.12/httpclient-4.5.12.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.12/httpclient-4.5.12-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.12/httpclient-4.5.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.httpcomponents:httpcore:4.4.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.logging.log4j:log4j-api:2.12.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.12.1/log4j-api-2.12.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.12.1/log4j-api-2.12.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.12.1/log4j-api-2.12.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.12.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.12.1/log4j-to-slf4j-2.12.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.12.1/log4j-to-slf4j-2.12.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.12.1/log4j-to-slf4j-2.12.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.doxia:doxia-core:1.9">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-core/1.9/doxia-core-1.9.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-core/1.9/doxia-core-1.9-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-core/1.9/doxia-core-1.9-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.doxia:doxia-decoration-model:1.9.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-decoration-model/1.9.2/doxia-decoration-model-1.9.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-decoration-model/1.9.2/doxia-decoration-model-1.9.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-decoration-model/1.9.2/doxia-decoration-model-1.9.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.doxia:doxia-integration-tools:1.9.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-integration-tools/1.9.2/doxia-integration-tools-1.9.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-integration-tools/1.9.2/doxia-integration-tools-1.9.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-integration-tools/1.9.2/doxia-integration-tools-1.9.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.doxia:doxia-logging-api:1.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-logging-api/1.7/doxia-logging-api-1.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-logging-api/1.7/doxia-logging-api-1.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-logging-api/1.7/doxia-logging-api-1.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.doxia:doxia-module-apt:1.9.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-module-apt/1.9.1/doxia-module-apt-1.9.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-module-apt/1.9.1/doxia-module-apt-1.9.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-module-apt/1.9.1/doxia-module-apt-1.9.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.doxia:doxia-module-confluence:1.9.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-module-confluence/1.9.1/doxia-module-confluence-1.9.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-module-confluence/1.9.1/doxia-module-confluence-1.9.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-module-confluence/1.9.1/doxia-module-confluence-1.9.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.doxia:doxia-module-docbook-simple:1.9.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-module-docbook-simple/1.9.1/doxia-module-docbook-simple-1.9.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-module-docbook-simple/1.9.1/doxia-module-docbook-simple-1.9.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-module-docbook-simple/1.9.1/doxia-module-docbook-simple-1.9.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.doxia:doxia-module-fml:1.9.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-module-fml/1.9.1/doxia-module-fml-1.9.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-module-fml/1.9.1/doxia-module-fml-1.9.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-module-fml/1.9.1/doxia-module-fml-1.9.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.doxia:doxia-module-markdown:1.9.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-module-markdown/1.9.1/doxia-module-markdown-1.9.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-module-markdown/1.9.1/doxia-module-markdown-1.9.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-module-markdown/1.9.1/doxia-module-markdown-1.9.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.doxia:doxia-module-twiki:1.9.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-module-twiki/1.9.1/doxia-module-twiki-1.9.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-module-twiki/1.9.1/doxia-module-twiki-1.9.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-module-twiki/1.9.1/doxia-module-twiki-1.9.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.doxia:doxia-module-xdoc:1.9.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-module-xdoc/1.9.1/doxia-module-xdoc-1.9.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-module-xdoc/1.9.1/doxia-module-xdoc-1.9.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-module-xdoc/1.9.1/doxia-module-xdoc-1.9.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.doxia:doxia-module-xhtml5:1.9.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-module-xhtml5/1.9.1/doxia-module-xhtml5-1.9.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-module-xhtml5/1.9.1/doxia-module-xhtml5-1.9.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-module-xhtml5/1.9.1/doxia-module-xhtml5-1.9.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.doxia:doxia-module-xhtml:1.9.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-module-xhtml/1.9.1/doxia-module-xhtml-1.9.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-module-xhtml/1.9.1/doxia-module-xhtml-1.9.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-module-xhtml/1.9.1/doxia-module-xhtml-1.9.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.doxia:doxia-sink-api:1.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-sink-api/1.7/doxia-sink-api-1.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-sink-api/1.7/doxia-sink-api-1.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-sink-api/1.7/doxia-sink-api-1.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.doxia:doxia-site-renderer:1.7.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-site-renderer/1.7.4/doxia-site-renderer-1.7.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-site-renderer/1.7.4/doxia-site-renderer-1.7.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-site-renderer/1.7.4/doxia-site-renderer-1.7.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.doxia:doxia-skin-model:1.7.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-skin-model/1.7.4/doxia-skin-model-1.7.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-skin-model/1.7.4/doxia-skin-model-1.7.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/doxia/doxia-skin-model/1.7.4/doxia-skin-model-1.7.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.enforcer:enforcer-api:3.0.0-M3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/enforcer/enforcer-api/3.0.0-M3/enforcer-api-3.0.0-M3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/enforcer/enforcer-api/3.0.0-M3/enforcer-api-3.0.0-M3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/enforcer/enforcer-api/3.0.0-M3/enforcer-api-3.0.0-M3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.enforcer:enforcer-rules:3.0.0-M3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/enforcer/enforcer-rules/3.0.0-M3/enforcer-rules-3.0.0-M3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/enforcer/enforcer-rules/3.0.0-M3/enforcer-rules-3.0.0-M3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/enforcer/enforcer-rules/3.0.0-M3/enforcer-rules-3.0.0-M3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven:maven-aether-provider:3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven:maven-archiver:3.4.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-archiver/3.4.0/maven-archiver-3.4.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-archiver/3.4.0/maven-archiver-3.4.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-archiver/3.4.0/maven-archiver-3.4.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven:maven-artifact:3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-artifact/3.0/maven-artifact-3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-artifact/3.0/maven-artifact-3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven:maven-artifact-manager:2.2.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-artifact-manager/2.2.1/maven-artifact-manager-2.2.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-artifact-manager/2.2.1/maven-artifact-manager-2.2.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-artifact-manager/2.2.1/maven-artifact-manager-2.2.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven:maven-compat:3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-compat/3.0/maven-compat-3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-compat/3.0/maven-compat-3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-compat/3.0/maven-compat-3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven:maven-core:3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-core/3.0/maven-core-3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-core/3.0/maven-core-3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-core/3.0/maven-core-3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven:maven-jxr:3.0.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-jxr/3.0.0/maven-jxr-3.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-jxr/3.0.0/maven-jxr-3.0.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-jxr/3.0.0/maven-jxr-3.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven:maven-model:3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-model/3.0/maven-model-3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-model/3.0/maven-model-3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-model/3.0/maven-model-3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven:maven-model-builder:3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven:maven-plugin-api:3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven:maven-plugin-descriptor:2.2.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-plugin-descriptor/2.2.1/maven-plugin-descriptor-2.2.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-plugin-descriptor/2.2.1/maven-plugin-descriptor-2.2.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-plugin-descriptor/2.2.1/maven-plugin-descriptor-2.2.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven:maven-plugin-registry:2.2.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-plugin-registry/2.2.1/maven-plugin-registry-2.2.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-plugin-registry/2.2.1/maven-plugin-registry-2.2.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-plugin-registry/2.2.1/maven-plugin-registry-2.2.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven:maven-profile:2.2.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-profile/2.2.1/maven-profile-2.2.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-profile/2.2.1/maven-profile-2.2.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-profile/2.2.1/maven-profile-2.2.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven:maven-project:2.2.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-project/2.2.1/maven-project-2.2.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-project/2.2.1/maven-project-2.2.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-project/2.2.1/maven-project-2.2.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven:maven-repository-metadata:3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven:maven-settings:3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-settings/3.0/maven-settings-3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-settings/3.0/maven-settings-3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-settings/3.0/maven-settings-3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven:maven-settings-builder:3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven:maven-toolchain:2.2.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-toolchain/2.2.1/maven-toolchain-2.2.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-toolchain/2.2.1/maven-toolchain-2.2.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-toolchain/2.2.1/maven-toolchain-2.2.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.plugin-tools:maven-plugin-annotations:3.5.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugin-tools/maven-plugin-annotations/3.5.2/maven-plugin-annotations-3.5.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugin-tools/maven-plugin-annotations/3.5.2/maven-plugin-annotations-3.5.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugin-tools/maven-plugin-annotations/3.5.2/maven-plugin-annotations-3.5.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.plugins:maven-changes-plugin:maven-plugin:2.12.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-changes-plugin/2.12.1/maven-changes-plugin-2.12.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-changes-plugin/2.12.1/maven-changes-plugin-2.12.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-changes-plugin/2.12.1/maven-changes-plugin-2.12.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.plugins:maven-checkstyle-plugin:maven-plugin:3.1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-checkstyle-plugin/3.1.1/maven-checkstyle-plugin-3.1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-checkstyle-plugin/3.1.1/maven-checkstyle-plugin-3.1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-checkstyle-plugin/3.1.1/maven-checkstyle-plugin-3.1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.plugins:maven-clean-plugin:maven-plugin:3.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-clean-plugin/3.1.0/maven-clean-plugin-3.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-clean-plugin/3.1.0/maven-clean-plugin-3.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-clean-plugin/3.1.0/maven-clean-plugin-3.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.plugins:maven-compiler-plugin:maven-plugin:3.8.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-compiler-plugin/3.8.1/maven-compiler-plugin-3.8.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-compiler-plugin/3.8.1/maven-compiler-plugin-3.8.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-compiler-plugin/3.8.1/maven-compiler-plugin-3.8.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.plugins:maven-dependency-plugin:maven-plugin:3.1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-dependency-plugin/3.1.2/maven-dependency-plugin-3.1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-dependency-plugin/3.1.2/maven-dependency-plugin-3.1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-dependency-plugin/3.1.2/maven-dependency-plugin-3.1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.plugins:maven-enforcer-plugin:maven-plugin:3.0.0-M3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-enforcer-plugin/3.0.0-M3/maven-enforcer-plugin-3.0.0-M3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-enforcer-plugin/3.0.0-M3/maven-enforcer-plugin-3.0.0-M3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-enforcer-plugin/3.0.0-M3/maven-enforcer-plugin-3.0.0-M3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.plugins:maven-invoker-plugin:maven-plugin:3.2.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-invoker-plugin/3.2.1/maven-invoker-plugin-3.2.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-invoker-plugin/3.2.1/maven-invoker-plugin-3.2.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-invoker-plugin/3.2.1/maven-invoker-plugin-3.2.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.plugins:maven-jxr-plugin:maven-plugin:3.0.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-jxr-plugin/3.0.0/maven-jxr-plugin-3.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-jxr-plugin/3.0.0/maven-jxr-plugin-3.0.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-jxr-plugin/3.0.0/maven-jxr-plugin-3.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.plugins:maven-pmd-plugin:maven-plugin:3.13.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-pmd-plugin/3.13.0/maven-pmd-plugin-3.13.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-pmd-plugin/3.13.0/maven-pmd-plugin-3.13.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-pmd-plugin/3.13.0/maven-pmd-plugin-3.13.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.plugins:maven-project-info-reports-plugin:maven-plugin:3.0.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-project-info-reports-plugin/3.0.0/maven-project-info-reports-plugin-3.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-project-info-reports-plugin/3.0.0/maven-project-info-reports-plugin-3.0.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-project-info-reports-plugin/3.0.0/maven-project-info-reports-plugin-3.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.plugins:maven-site-plugin:maven-plugin:3.9.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-site-plugin/3.9.0/maven-site-plugin-3.9.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-site-plugin/3.9.0/maven-site-plugin-3.9.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-site-plugin/3.9.0/maven-site-plugin-3.9.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.plugins:maven-surefire-plugin:maven-plugin:2.22.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-surefire-plugin/2.22.2/maven-surefire-plugin-2.22.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-surefire-plugin/2.22.2/maven-surefire-plugin-2.22.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-surefire-plugin/2.22.2/maven-surefire-plugin-2.22.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.plugins:maven-surefire-report-plugin:maven-plugin:3.0.0-M4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-surefire-report-plugin/3.0.0-M4/maven-surefire-report-plugin-3.0.0-M4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-surefire-report-plugin/3.0.0-M4/maven-surefire-report-plugin-3.0.0-M4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/plugins/maven-surefire-report-plugin/3.0.0-M4/maven-surefire-report-plugin-3.0.0-M4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.reporting:maven-reporting-api:3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.reporting:maven-reporting-exec:1.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/reporting/maven-reporting-exec/1.4/maven-reporting-exec-1.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/reporting/maven-reporting-exec/1.4/maven-reporting-exec-1.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/reporting/maven-reporting-exec/1.4/maven-reporting-exec-1.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.reporting:maven-reporting-impl:2.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/reporting/maven-reporting-impl/2.4/maven-reporting-impl-2.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/reporting/maven-reporting-impl/2.4/maven-reporting-impl-2.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/reporting/maven-reporting-impl/2.4/maven-reporting-impl-2.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.resolver:maven-resolver-api:1.4.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-api/1.4.1/maven-resolver-api-1.4.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-api/1.4.1/maven-resolver-api-1.4.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-api/1.4.1/maven-resolver-api-1.4.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.resolver:maven-resolver-util:1.4.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-util/1.4.1/maven-resolver-util-1.4.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-util/1.4.1/maven-resolver-util-1.4.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-util/1.4.1/maven-resolver-util-1.4.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.scm:maven-scm-api:1.10.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-api/1.10.0/maven-scm-api-1.10.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-api/1.10.0/maven-scm-api-1.10.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-api/1.10.0/maven-scm-api-1.10.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.scm:maven-scm-manager-plexus:1.10.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-manager-plexus/1.10.0/maven-scm-manager-plexus-1.10.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-manager-plexus/1.10.0/maven-scm-manager-plexus-1.10.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-manager-plexus/1.10.0/maven-scm-manager-plexus-1.10.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.scm:maven-scm-provider-cvs-commons:1.10.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-cvs-commons/1.10.0/maven-scm-provider-cvs-commons-1.10.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-cvs-commons/1.10.0/maven-scm-provider-cvs-commons-1.10.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-cvs-commons/1.10.0/maven-scm-provider-cvs-commons-1.10.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.scm:maven-scm-provider-cvsexe:1.10.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-cvsexe/1.10.0/maven-scm-provider-cvsexe-1.10.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-cvsexe/1.10.0/maven-scm-provider-cvsexe-1.10.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-cvsexe/1.10.0/maven-scm-provider-cvsexe-1.10.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.scm:maven-scm-provider-cvsjava:1.10.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-cvsjava/1.10.0/maven-scm-provider-cvsjava-1.10.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-cvsjava/1.10.0/maven-scm-provider-cvsjava-1.10.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-cvsjava/1.10.0/maven-scm-provider-cvsjava-1.10.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.scm:maven-scm-provider-git-commons:1.10.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-git-commons/1.10.0/maven-scm-provider-git-commons-1.10.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-git-commons/1.10.0/maven-scm-provider-git-commons-1.10.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-git-commons/1.10.0/maven-scm-provider-git-commons-1.10.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.scm:maven-scm-provider-gitexe:1.10.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-gitexe/1.10.0/maven-scm-provider-gitexe-1.10.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-gitexe/1.10.0/maven-scm-provider-gitexe-1.10.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-gitexe/1.10.0/maven-scm-provider-gitexe-1.10.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.scm:maven-scm-provider-hg:1.10.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-hg/1.10.0/maven-scm-provider-hg-1.10.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-hg/1.10.0/maven-scm-provider-hg-1.10.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-hg/1.10.0/maven-scm-provider-hg-1.10.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.scm:maven-scm-provider-perforce:1.10.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-perforce/1.10.0/maven-scm-provider-perforce-1.10.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-perforce/1.10.0/maven-scm-provider-perforce-1.10.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-perforce/1.10.0/maven-scm-provider-perforce-1.10.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.scm:maven-scm-provider-starteam:1.10.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-starteam/1.10.0/maven-scm-provider-starteam-1.10.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-starteam/1.10.0/maven-scm-provider-starteam-1.10.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-starteam/1.10.0/maven-scm-provider-starteam-1.10.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.scm:maven-scm-provider-svn-commons:1.10.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-svn-commons/1.10.0/maven-scm-provider-svn-commons-1.10.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-svn-commons/1.10.0/maven-scm-provider-svn-commons-1.10.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-svn-commons/1.10.0/maven-scm-provider-svn-commons-1.10.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.scm:maven-scm-provider-svnexe:1.10.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-svnexe/1.10.0/maven-scm-provider-svnexe-1.10.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-svnexe/1.10.0/maven-scm-provider-svnexe-1.10.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/scm/maven-scm-provider-svnexe/1.10.0/maven-scm-provider-svnexe-1.10.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.shared:file-management:3.0.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/file-management/3.0.0/file-management-3.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/file-management/3.0.0/file-management-3.0.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/file-management/3.0.0/file-management-3.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.shared:maven-artifact-transfer:0.11.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-artifact-transfer/0.11.0/maven-artifact-transfer-0.11.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-artifact-transfer/0.11.0/maven-artifact-transfer-0.11.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-artifact-transfer/0.11.0/maven-artifact-transfer-0.11.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.shared:maven-common-artifact-filters:3.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-common-artifact-filters/3.1.0/maven-common-artifact-filters-3.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-common-artifact-filters/3.1.0/maven-common-artifact-filters-3.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-common-artifact-filters/3.1.0/maven-common-artifact-filters-3.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.shared:maven-dependency-analyzer:1.11.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-dependency-analyzer/1.11.1/maven-dependency-analyzer-1.11.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-dependency-analyzer/1.11.1/maven-dependency-analyzer-1.11.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-dependency-analyzer/1.11.1/maven-dependency-analyzer-1.11.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.shared:maven-dependency-tree:3.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-dependency-tree/3.0.1/maven-dependency-tree-3.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-dependency-tree/3.0.1/maven-dependency-tree-3.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-dependency-tree/3.0.1/maven-dependency-tree-3.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.shared:maven-filtering:1.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-filtering/1.3/maven-filtering-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-filtering/1.3/maven-filtering-1.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-filtering/1.3/maven-filtering-1.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.shared:maven-invoker:3.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-invoker/3.0.1/maven-invoker-3.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-invoker/3.0.1/maven-invoker-3.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-invoker/3.0.1/maven-invoker-3.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.shared:maven-script-interpreter:1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-script-interpreter/1.2/maven-script-interpreter-1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-script-interpreter/1.2/maven-script-interpreter-1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-script-interpreter/1.2/maven-script-interpreter-1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.shared:maven-shared-incremental:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-shared-incremental/1.1/maven-shared-incremental-1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-shared-incremental/1.1/maven-shared-incremental-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-shared-incremental/1.1/maven-shared-incremental-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.shared:maven-shared-io:3.0.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-shared-io/3.0.0/maven-shared-io-3.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-shared-io/3.0.0/maven-shared-io-3.0.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-shared-io/3.0.0/maven-shared-io-3.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.shared:maven-shared-jar:1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-shared-jar/1.2/maven-shared-jar-1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-shared-jar/1.2/maven-shared-jar-1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-shared-jar/1.2/maven-shared-jar-1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.shared:maven-shared-utils:3.2.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-shared-utils/3.2.1/maven-shared-utils-3.2.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-shared-utils/3.2.1/maven-shared-utils-3.2.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/shared/maven-shared-utils/3.2.1/maven-shared-utils-3.2.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.surefire:maven-surefire-common:2.22.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/surefire/maven-surefire-common/2.22.2/maven-surefire-common-2.22.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/surefire/maven-surefire-common/2.22.2/maven-surefire-common-2.22.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/surefire/maven-surefire-common/2.22.2/maven-surefire-common-2.22.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.surefire:surefire-api:2.22.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/surefire/surefire-api/2.22.2/surefire-api-2.22.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/surefire/surefire-api/2.22.2/surefire-api-2.22.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/surefire/surefire-api/2.22.2/surefire-api-2.22.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.surefire:surefire-booter:2.22.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/surefire/surefire-booter/2.22.2/surefire-booter-2.22.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/surefire/surefire-booter/2.22.2/surefire-booter-2.22.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/surefire/surefire-booter/2.22.2/surefire-booter-2.22.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.surefire:surefire-logger-api:3.0.0-M4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/surefire/surefire-logger-api/3.0.0-M4/surefire-logger-api-3.0.0-M4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/surefire/surefire-logger-api/3.0.0-M4/surefire-logger-api-3.0.0-M4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/surefire/surefire-logger-api/3.0.0-M4/surefire-logger-api-3.0.0-M4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.surefire:surefire-report-parser:3.0.0-M4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/surefire/surefire-report-parser/3.0.0-M4/surefire-report-parser-3.0.0-M4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/surefire/surefire-report-parser/3.0.0-M4/surefire-report-parser-3.0.0-M4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/surefire/surefire-report-parser/3.0.0-M4/surefire-report-parser-3.0.0-M4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.wagon:wagon-http-lightweight:3.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/wagon/wagon-http-lightweight/3.1.0/wagon-http-lightweight-3.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/wagon/wagon-http-lightweight/3.1.0/wagon-http-lightweight-3.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/wagon/wagon-http-lightweight/3.1.0/wagon-http-lightweight-3.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.wagon:wagon-http-shared:3.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/wagon/wagon-http-shared/3.1.0/wagon-http-shared-3.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/wagon/wagon-http-shared/3.1.0/wagon-http-shared-3.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/wagon/wagon-http-shared/3.1.0/wagon-http-shared-3.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.maven.wagon:wagon-provider-api:3.3.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/wagon/wagon-provider-api/3.3.1/wagon-provider-api-3.3.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/wagon/wagon-provider-api/3.3.1/wagon-provider-api-3.3.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/wagon/wagon-provider-api/3.3.1/wagon-provider-api-3.3.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.struts:struts-core:1.3.8">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/struts/struts-core/1.3.8/struts-core-1.3.8-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/struts/struts-core/1.3.8/struts-core-1.3.8-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.struts:struts-taglib:1.3.8">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.struts:struts-tiles:1.3.8">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.33">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.33/tomcat-embed-core-9.0.33.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.33/tomcat-embed-core-9.0.33-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.33/tomcat-embed-core-9.0.33-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.33">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/9.0.33/tomcat-embed-el-9.0.33.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/9.0.33/tomcat-embed-el-9.0.33-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/9.0.33/tomcat-embed-el-9.0.33-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.33">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.33/tomcat-embed-websocket-9.0.33.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.33/tomcat-embed-websocket-9.0.33-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.33/tomcat-embed-websocket-9.0.33-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.velocity:velocity:1.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/velocity/velocity/1.7/velocity-1.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/velocity/velocity/1.7/velocity-1.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/velocity/velocity/1.7/velocity-1.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.velocity:velocity-tools:2.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.ws.commons:ws-commons-util:1.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ws/commons/ws-commons-util/1.0.1/ws-commons-util-1.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ws/commons/ws-commons-util/1.0.1/ws-commons-util-1.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ws/commons/ws-commons-util/1.0.1/ws-commons-util-1.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.ws.xmlschema:xmlschema-core:2.0.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ws/xmlschema/xmlschema-core/2.0.3/xmlschema-core-2.0.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ws/xmlschema/xmlschema-core/2.0.3/xmlschema-core-2.0.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ws/xmlschema/xmlschema-core/2.0.3/xmlschema-core-2.0.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.xbean:xbean-reflect:3.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xbean/xbean-reflect/3.7/xbean-reflect-3.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xbean/xbean-reflect/3.7/xbean-reflect-3.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xbean/xbean-reflect/3.7/xbean-reflect-3.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.xmlrpc:xmlrpc-client:3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlrpc/xmlrpc-client/3.0/xmlrpc-client-3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlrpc/xmlrpc-client/3.0/xmlrpc-client-3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlrpc/xmlrpc-client/3.0/xmlrpc-client-3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.xmlrpc:xmlrpc-common:3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlrpc/xmlrpc-common/3.0/xmlrpc-common-3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlrpc/xmlrpc-common/3.0/xmlrpc-common-3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlrpc/xmlrpc-common/3.0/xmlrpc-common-3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apiguardian:apiguardian-api:1.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.aspectj:aspectjweaver:1.9.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjweaver/1.9.5/aspectjweaver-1.9.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjweaver/1.9.5/aspectjweaver-1.9.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjweaver/1.9.5/aspectjweaver-1.9.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.assertj:assertj-core:3.13.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.13.2/assertj-core-3.13.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.13.2/assertj-core-3.13.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.13.2/assertj-core-3.13.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.attoparser:attoparser:2.0.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/attoparser/attoparser/2.0.5.RELEASE/attoparser-2.0.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/attoparser/attoparser/2.0.5.RELEASE/attoparser-2.0.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/attoparser/attoparser/2.0.5.RELEASE/attoparser-2.0.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.beanshell:bsh:2.0b4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/beanshell/bsh/2.0b4/bsh-2.0b4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/beanshell/bsh/2.0b4/bsh-2.0b4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.checkerframework:checker-qual:2.10.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/checkerframework/checker-qual/2.10.0/checker-qual-2.10.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/checkerframework/checker-qual/2.10.0/checker-qual-2.10.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/checkerframework/checker-qual/2.10.0/checker-qual-2.10.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.groovy:groovy:2.5.10">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy/2.5.10/groovy-2.5.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy/2.5.10/groovy-2.5.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy/2.5.10/groovy-2.5.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.groovy:groovy-all:2.4.8">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-all/2.4.8/groovy-all-2.4.8.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-all/2.4.8/groovy-all-2.4.8-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-all/2.4.8/groovy-all-2.4.8-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.groovy:groovy-ant:indy:3.0.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-ant/3.0.2/groovy-ant-3.0.2-indy.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-ant/3.0.2/groovy-ant-3.0.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-ant/3.0.2/groovy-ant-3.0.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.groovy:groovy-cli-picocli:2.5.10">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-cli-picocli/2.5.10/groovy-cli-picocli-2.5.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-cli-picocli/2.5.10/groovy-cli-picocli-2.5.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-cli-picocli/2.5.10/groovy-cli-picocli-2.5.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.groovy:groovy-dateutil:indy:3.0.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-dateutil/3.0.2/groovy-dateutil-3.0.2-indy.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-dateutil/3.0.2/groovy-dateutil-3.0.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-dateutil/3.0.2/groovy-dateutil-3.0.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.groovy:groovy-docgenerator:2.5.10">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-docgenerator/2.5.10/groovy-docgenerator-2.5.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-docgenerator/2.5.10/groovy-docgenerator-2.5.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-docgenerator/2.5.10/groovy-docgenerator-2.5.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.groovy:groovy-groovydoc:2.5.10">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-groovydoc/2.5.10/groovy-groovydoc-2.5.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-groovydoc/2.5.10/groovy-groovydoc-2.5.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-groovydoc/2.5.10/groovy-groovydoc-2.5.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.groovy:groovy:indy:3.0.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy/3.0.2/groovy-3.0.2-indy.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy/3.0.2/groovy-3.0.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy/3.0.2/groovy-3.0.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.groovy:groovy-templates:2.5.10">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-templates/2.5.10/groovy-templates-2.5.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-templates/2.5.10/groovy-templates-2.5.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-templates/2.5.10/groovy-templates-2.5.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.groovy:groovy-xml:2.5.10">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-xml/2.5.10/groovy-xml-2.5.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-xml/2.5.10/groovy-xml-2.5.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-xml/2.5.10/groovy-xml-2.5.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.plexus:plexus-archiver:4.2.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-archiver/4.2.2/plexus-archiver-4.2.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-archiver/4.2.2/plexus-archiver-4.2.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-archiver/4.2.2/plexus-archiver-4.2.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.plexus:plexus-classworlds:2.5.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.plexus:plexus-compiler-api:2.8.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-compiler-api/2.8.4/plexus-compiler-api-2.8.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-compiler-api/2.8.4/plexus-compiler-api-2.8.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-compiler-api/2.8.4/plexus-compiler-api-2.8.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.plexus:plexus-compiler-javac:2.8.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-compiler-javac/2.8.4/plexus-compiler-javac-2.8.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-compiler-javac/2.8.4/plexus-compiler-javac-2.8.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-compiler-javac/2.8.4/plexus-compiler-javac-2.8.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.plexus:plexus-compiler-manager:2.8.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-compiler-manager/2.8.4/plexus-compiler-manager-2.8.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-compiler-manager/2.8.4/plexus-compiler-manager-2.8.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-compiler-manager/2.8.4/plexus-compiler-manager-2.8.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.plexus:plexus-component-annotations:2.0.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-component-annotations/2.0.0/plexus-component-annotations-2.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-component-annotations/2.0.0/plexus-component-annotations-2.0.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-component-annotations/2.0.0/plexus-component-annotations-2.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.plexus:plexus-container-default:2.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-container-default/2.1.0/plexus-container-default-2.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-container-default/2.1.0/plexus-container-default-2.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-container-default/2.1.0/plexus-container-default-2.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.plexus:plexus-digest:1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-digest/1.0/plexus-digest-1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-digest/1.0/plexus-digest-1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-digest/1.0/plexus-digest-1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.plexus:plexus-i18n:1.0-beta-7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.plexus:plexus-interpolation:1.26">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-interpolation/1.26/plexus-interpolation-1.26.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-interpolation/1.26/plexus-interpolation-1.26-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-interpolation/1.26/plexus-interpolation-1.26-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.plexus:plexus-io:3.2.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-io/3.2.0/plexus-io-3.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-io/3.2.0/plexus-io-3.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-io/3.2.0/plexus-io-3.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.plexus:plexus-java:0.9.10">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-java/0.9.10/plexus-java-0.9.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-java/0.9.10/plexus-java-0.9.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-java/0.9.10/plexus-java-0.9.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.plexus:plexus-mail-sender-api:1.0-alpha-7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-mail-sender-api/1.0-alpha-7/plexus-mail-sender-api-1.0-alpha-7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-mail-sender-api/1.0-alpha-7/plexus-mail-sender-api-1.0-alpha-7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-mail-sender-api/1.0-alpha-7/plexus-mail-sender-api-1.0-alpha-7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.plexus:plexus-mail-sender-javamail:1.0-alpha-7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-mail-sender-javamail/1.0-alpha-7/plexus-mail-sender-javamail-1.0-alpha-7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-mail-sender-javamail/1.0-alpha-7/plexus-mail-sender-javamail-1.0-alpha-7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-mail-sender-javamail/1.0-alpha-7/plexus-mail-sender-javamail-1.0-alpha-7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.plexus:plexus-mail-sender-simple:1.0-alpha-7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-mail-sender-simple/1.0-alpha-7/plexus-mail-sender-simple-1.0-alpha-7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-mail-sender-simple/1.0-alpha-7/plexus-mail-sender-simple-1.0-alpha-7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-mail-sender-simple/1.0-alpha-7/plexus-mail-sender-simple-1.0-alpha-7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.plexus:plexus-resources:1.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-resources/1.1.0/plexus-resources-1.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-resources/1.1.0/plexus-resources-1.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-resources/1.1.0/plexus-resources-1.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.plexus:plexus-utils:3.3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-utils/3.3.0/plexus-utils-3.3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-utils/3.3.0/plexus-utils-3.3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-utils/3.3.0/plexus-utils-3.3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.plexus:plexus-velocity:1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-velocity/1.2/plexus-velocity-1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-velocity/1.2/plexus-velocity-1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-velocity/1.2/plexus-velocity-1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.woodstox:stax2-api:3.1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/woodstox/stax2-api/3.1.1/stax2-api-3.1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/woodstox/stax2-api/3.1.1/stax2-api-3.1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/woodstox/stax2-api/3.1.1/stax2-api-3.1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.1.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/woodstox/woodstox-core-asl/4.1.4/woodstox-core-asl-4.1.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/woodstox/woodstox-core-asl/4.1.4/woodstox-core-asl-4.1.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/woodstox/woodstox-core-asl/4.1.4/woodstox-core-asl-4.1.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.dom4j:dom4j:2.1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/dom4j/dom4j/2.1.1/dom4j-2.1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/dom4j/dom4j/2.1.1/dom4j-2.1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/dom4j/dom4j/2.1.1/dom4j-2.1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.eclipse.aether:aether-util:0.9.0.M2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.eclipse.jetty:jetty-http:9.4.27.v20200227">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-http/9.4.27.v20200227/jetty-http-9.4.27.v20200227.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-http/9.4.27.v20200227/jetty-http-9.4.27.v20200227-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-http/9.4.27.v20200227/jetty-http-9.4.27.v20200227-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.eclipse.jetty:jetty-io:9.4.27.v20200227">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-io/9.4.27.v20200227/jetty-io-9.4.27.v20200227.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-io/9.4.27.v20200227/jetty-io-9.4.27.v20200227-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-io/9.4.27.v20200227/jetty-io-9.4.27.v20200227-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.eclipse.jetty:jetty-security:9.4.27.v20200227">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-security/9.4.27.v20200227/jetty-security-9.4.27.v20200227.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-security/9.4.27.v20200227/jetty-security-9.4.27.v20200227-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-security/9.4.27.v20200227/jetty-security-9.4.27.v20200227-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.eclipse.jetty:jetty-server:9.4.27.v20200227">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-server/9.4.27.v20200227/jetty-server-9.4.27.v20200227.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-server/9.4.27.v20200227/jetty-server-9.4.27.v20200227-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-server/9.4.27.v20200227/jetty-server-9.4.27.v20200227-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.eclipse.jetty:jetty-servlet:9.4.27.v20200227">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-servlet/9.4.27.v20200227/jetty-servlet-9.4.27.v20200227.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-servlet/9.4.27.v20200227/jetty-servlet-9.4.27.v20200227-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-servlet/9.4.27.v20200227/jetty-servlet-9.4.27.v20200227-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.eclipse.jetty:jetty-util:9.4.27.v20200227">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-util/9.4.27.v20200227/jetty-util-9.4.27.v20200227.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-util/9.4.27.v20200227/jetty-util-9.4.27.v20200227-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-util/9.4.27.v20200227/jetty-util-9.4.27.v20200227-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.eclipse.jetty:jetty-webapp:9.4.27.v20200227">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-webapp/9.4.27.v20200227/jetty-webapp-9.4.27.v20200227.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-webapp/9.4.27.v20200227/jetty-webapp-9.4.27.v20200227-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-webapp/9.4.27.v20200227/jetty-webapp-9.4.27.v20200227-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.eclipse.jetty:jetty-xml:9.4.27.v20200227">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-xml/9.4.27.v20200227/jetty-xml-9.4.27.v20200227.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-xml/9.4.27.v20200227/jetty-xml-9.4.27.v20200227-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/jetty-xml/9.4.27.v20200227/jetty-xml-9.4.27.v20200227-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/mylyn/github/org.eclipse.egit.github.core/2.1.5/org.eclipse.egit.github.core-2.1.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/mylyn/github/org.eclipse.egit.github.core/2.1.5/org.eclipse.egit.github.core-2.1.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/mylyn/github/org.eclipse.egit.github.core/2.1.5/org.eclipse.egit.github.core-2.1.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jaxb/jaxb-runtime/2.3.2/jaxb-runtime-2.3.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jaxb/jaxb-runtime/2.3.2/jaxb-runtime-2.3.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jaxb/jaxb-runtime/2.3.2/jaxb-runtime-2.3.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.glassfish.jaxb:txw2:2.3.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jaxb/txw2/2.3.2/txw2-2.3.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jaxb/txw2/2.3.2/txw2-2.3.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jaxb/txw2/2.3.2/txw2-2.3.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.hamcrest:hamcrest:2.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest/2.1/hamcrest-2.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest/2.1/hamcrest-2.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest/2.1/hamcrest-2.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.hamcrest:hamcrest-core:2.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/2.1/hamcrest-core-2.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/2.1/hamcrest-core-2.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/2.1/hamcrest-core-2.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.hibernate.common:hibernate-commons-annotations:5.1.0.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/common/hibernate-commons-annotations/5.1.0.Final/hibernate-commons-annotations-5.1.0.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/common/hibernate-commons-annotations/5.1.0.Final/hibernate-commons-annotations-5.1.0.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/common/hibernate-commons-annotations/5.1.0.Final/hibernate-commons-annotations-5.1.0.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.hibernate:hibernate-core:5.4.12.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/5.4.12.Final/hibernate-core-5.4.12.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/5.4.12.Final/hibernate-core-5.4.12.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/5.4.12.Final/hibernate-core-5.4.12.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.0.18.Final/hibernate-validator-6.0.18.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.0.18.Final/hibernate-validator-6.0.18.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.0.18.Final/hibernate-validator-6.0.18.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.iq80.snappy:snappy:0.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/iq80/snappy/snappy/0.4/snappy-0.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/iq80/snappy/snappy/0.4/snappy-0.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/iq80/snappy/snappy/0.4/snappy-0.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.javassist:javassist:3.24.0-GA">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.24.0-GA/javassist-3.24.0-GA.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.24.0-GA/javassist-3.24.0-GA-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.24.0-GA/javassist-3.24.0-GA-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.jboss:jandex:2.1.1.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/jandex/2.1.1.Final/jandex-2.1.1.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/jandex/2.1.1.Final/jandex-2.1.1.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/jandex/2.1.1.Final/jandex-2.1.1.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.4.1.Final/jboss-logging-3.4.1.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.4.1.Final/jboss-logging-3.4.1.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.4.1.Final/jboss-logging-3.4.1.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.jsoup:jsoup:1.8.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jsoup/jsoup/1.8.3/jsoup-1.8.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jsoup/jsoup/1.8.3/jsoup-1.8.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jsoup/jsoup/1.8.3/jsoup-1.8.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.junit.jupiter:junit-jupiter:5.5.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter/5.5.2/junit-jupiter-5.5.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter/5.5.2/junit-jupiter-5.5.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter/5.5.2/junit-jupiter-5.5.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.junit.jupiter:junit-jupiter-api:5.5.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.5.2/junit-jupiter-api-5.5.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.5.2/junit-jupiter-api-5.5.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.5.2/junit-jupiter-api-5.5.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.junit.jupiter:junit-jupiter-engine:5.5.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.5.2/junit-jupiter-engine-5.5.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.5.2/junit-jupiter-engine-5.5.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.5.2/junit-jupiter-engine-5.5.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.junit.jupiter:junit-jupiter-params:5.5.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-params/5.5.2/junit-jupiter-params-5.5.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-params/5.5.2/junit-jupiter-params-5.5.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-params/5.5.2/junit-jupiter-params-5.5.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.junit.platform:junit-platform-commons:1.5.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.5.2/junit-platform-commons-1.5.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.5.2/junit-platform-commons-1.5.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.5.2/junit-platform-commons-1.5.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.junit.platform:junit-platform-engine:1.5.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.5.2/junit-platform-engine-1.5.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.5.2/junit-platform-engine-1.5.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.5.2/junit-platform-engine-1.5.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.jvnet.staxex:stax-ex:1.8.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jvnet/staxex/stax-ex/1.8.1/stax-ex-1.8.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jvnet/staxex/stax-ex/1.8.1/stax-ex-1.8.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jvnet/staxex/stax-ex/1.8.1/stax-ex-1.8.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.mockito:mockito-core:3.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/3.1.0/mockito-core-3.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/3.1.0/mockito-core-3.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/3.1.0/mockito-core-3.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.mockito:mockito-junit-jupiter:3.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-junit-jupiter/3.1.0/mockito-junit-jupiter-3.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-junit-jupiter/3.1.0/mockito-junit-jupiter-3.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-junit-jupiter/3.1.0/mockito-junit-jupiter-3.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.mozilla:rhino:1.7.7.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mozilla/rhino/1.7.7.2/rhino-1.7.7.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mozilla/rhino/1.7.7.2/rhino-1.7.7.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mozilla/rhino/1.7.7.2/rhino-1.7.7.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.netbeans.lib:cvsclient:20060125">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/lib/cvsclient/20060125/cvsclient-20060125.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/lib/cvsclient/20060125/cvsclient-20060125-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/netbeans/lib/cvsclient/20060125/cvsclient-20060125-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.nibor.autolink:autolink:0.6.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/nibor/autolink/autolink/0.6.0/autolink-0.6.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/nibor/autolink/autolink/0.6.0/autolink-0.6.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/nibor/autolink/autolink/0.6.0/autolink-0.6.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.objenesis:objenesis:2.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.6/objenesis-2.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.6/objenesis-2.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.6/objenesis-2.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.opentest4j:opentest4j:1.2.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.ow2.asm:asm:7.3.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/7.3.1/asm-7.3.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/7.3.1/asm-7.3.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/7.3.1/asm-7.3.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.ow2.asm:asm-analysis:7.3.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm-analysis/7.3.1/asm-analysis-7.3.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm-analysis/7.3.1/asm-analysis-7.3.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm-analysis/7.3.1/asm-analysis-7.3.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.ow2.asm:asm-commons:7.3.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm-commons/7.3.1/asm-commons-7.3.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm-commons/7.3.1/asm-commons-7.3.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm-commons/7.3.1/asm-commons-7.3.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.ow2.asm:asm-tree:7.3.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm-tree/7.3.1/asm-tree-7.3.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm-tree/7.3.1/asm-tree-7.3.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm-tree/7.3.1/asm-tree-7.3.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.ow2.asm:asm-util:7.3.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm-util/7.3.1/asm-util-7.3.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm-util/7.3.1/asm-util-7.3.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm-util/7.3.1/asm-util-7.3.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.postgresql:postgresql:42.2.11">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/postgresql/postgresql/42.2.11/postgresql-42.2.11.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/postgresql/postgresql/42.2.11/postgresql-42.2.11-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/postgresql/postgresql/42.2.11/postgresql-42.2.11-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.projectlombok:lombok:1.18.12">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.12/lombok-1.18.12.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.12/lombok-1.18.12-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.12/lombok-1.18.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.skyscreamer:jsonassert:1.5.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:jul-to-slf4j:1.7.30">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:slf4j-api:1.7.30">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:slf4j-simple:1.7.30">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-simple/1.7.30/slf4j-simple-1.7.30.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-simple/1.7.30/slf4j-simple-1.7.30-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-simple/1.7.30/slf4j-simple-1.7.30-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.sonatype.aether:aether-api:1.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/aether/aether-api/1.7/aether-api-1.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/aether/aether-api/1.7/aether-api-1.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/aether/aether-api/1.7/aether-api-1.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.sonatype.aether:aether-impl:1.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/aether/aether-impl/1.7/aether-impl-1.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/aether/aether-impl/1.7/aether-impl-1.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.sonatype.aether:aether-spi:1.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/aether/aether-spi/1.7/aether-spi-1.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/aether/aether-spi/1.7/aether-spi-1.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.sonatype.aether:aether-util:1.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/aether/aether-util/1.7/aether-util-1.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/aether/aether-util/1.7/aether-util-1.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.sonatype.plexus:plexus-build-api:0.0.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/plexus/plexus-build-api/0.0.7/plexus-build-api-0.0.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/plexus/plexus-build-api/0.0.7/plexus-build-api-0.0.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/plexus/plexus-build-api/0.0.7/plexus-build-api-0.0.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.sonatype.plexus:plexus-cipher:1.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.sonatype.plexus:plexus-sec-dispatcher:1.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.sonatype.sisu:sisu-guice:noaop:2.1.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.sonatype.sisu:sisu-inject-bean:1.4.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.sonatype.sisu:sisu-inject-plexus:1.4.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot:2.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.2.6.RELEASE/spring-boot-2.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.2.6.RELEASE/spring-boot-2.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.2.6.RELEASE/spring-boot-2.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.2.6.RELEASE/spring-boot-autoconfigure-2.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.2.6.RELEASE/spring-boot-autoconfigure-2.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.2.6.RELEASE/spring-boot-autoconfigure-2.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-configuration-metadata:2.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-configuration-metadata/2.2.6.RELEASE/spring-boot-configuration-metadata-2.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-configuration-metadata/2.2.6.RELEASE/spring-boot-configuration-metadata-2.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-configuration-metadata/2.2.6.RELEASE/spring-boot-configuration-metadata-2.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-configuration-processor/2.2.6.RELEASE/spring-boot-configuration-processor-2.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-configuration-processor/2.2.6.RELEASE/spring-boot-configuration-processor-2.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-configuration-processor/2.2.6.RELEASE/spring-boot-configuration-processor-2.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-devtools:2.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-devtools/2.2.6.RELEASE/spring-boot-devtools-2.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-devtools/2.2.6.RELEASE/spring-boot-devtools-2.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-devtools/2.2.6.RELEASE/spring-boot-devtools-2.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-loader-tools:2.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-loader-tools/2.2.6.RELEASE/spring-boot-loader-tools-2.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-loader-tools/2.2.6.RELEASE/spring-boot-loader-tools-2.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-loader-tools/2.2.6.RELEASE/spring-boot-loader-tools-2.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-maven-plugin:maven-plugin:2.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-maven-plugin/2.2.6.RELEASE/spring-boot-maven-plugin-2.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-maven-plugin/2.2.6.RELEASE/spring-boot-maven-plugin-2.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-maven-plugin/2.2.6.RELEASE/spring-boot-maven-plugin-2.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-properties-migrator:2.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-properties-migrator/2.2.6.RELEASE/spring-boot-properties-migrator-2.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-properties-migrator/2.2.6.RELEASE/spring-boot-properties-migrator-2.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-properties-migrator/2.2.6.RELEASE/spring-boot-properties-migrator-2.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter:2.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.2.6.RELEASE/spring-boot-starter-2.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.2.6.RELEASE/spring-boot-starter-2.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.2.6.RELEASE/spring-boot-starter-2.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-aop:2.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-aop/2.2.6.RELEASE/spring-boot-starter-aop-2.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-aop/2.2.6.RELEASE/spring-boot-starter-aop-2.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-aop/2.2.6.RELEASE/spring-boot-starter-aop-2.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-jpa/2.2.6.RELEASE/spring-boot-starter-data-jpa-2.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-jpa/2.2.6.RELEASE/spring-boot-starter-data-jpa-2.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-jpa/2.2.6.RELEASE/spring-boot-starter-data-jpa-2.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.2.6.RELEASE/spring-boot-starter-jdbc-2.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.2.6.RELEASE/spring-boot-starter-jdbc-2.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.2.6.RELEASE/spring-boot-starter-jdbc-2.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-json:2.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.2.6.RELEASE/spring-boot-starter-json-2.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.2.6.RELEASE/spring-boot-starter-json-2.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.2.6.RELEASE/spring-boot-starter-json-2.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-logging:2.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.2.6.RELEASE/spring-boot-starter-logging-2.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.2.6.RELEASE/spring-boot-starter-logging-2.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.2.6.RELEASE/spring-boot-starter-logging-2.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-mail:2.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-mail/2.2.6.RELEASE/spring-boot-starter-mail-2.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-mail/2.2.6.RELEASE/spring-boot-starter-mail-2.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-mail/2.2.6.RELEASE/spring-boot-starter-mail-2.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-security:2.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-security/2.2.6.RELEASE/spring-boot-starter-security-2.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-security/2.2.6.RELEASE/spring-boot-starter-security-2.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-security/2.2.6.RELEASE/spring-boot-starter-security-2.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-test:2.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/2.2.6.RELEASE/spring-boot-starter-test-2.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/2.2.6.RELEASE/spring-boot-starter-test-2.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/2.2.6.RELEASE/spring-boot-starter-test-2.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:2.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-thymeleaf/2.2.6.RELEASE/spring-boot-starter-thymeleaf-2.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-thymeleaf/2.2.6.RELEASE/spring-boot-starter-thymeleaf-2.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-thymeleaf/2.2.6.RELEASE/spring-boot-starter-thymeleaf-2.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.2.6.RELEASE/spring-boot-starter-tomcat-2.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.2.6.RELEASE/spring-boot-starter-tomcat-2.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.2.6.RELEASE/spring-boot-starter-tomcat-2.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-validation:2.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-validation/2.2.6.RELEASE/spring-boot-starter-validation-2.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-validation/2.2.6.RELEASE/spring-boot-starter-validation-2.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-validation/2.2.6.RELEASE/spring-boot-starter-validation-2.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.2.6.RELEASE/spring-boot-starter-web-2.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.2.6.RELEASE/spring-boot-starter-web-2.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.2.6.RELEASE/spring-boot-starter-web-2.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-test:2.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.2.6.RELEASE/spring-boot-test-2.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.2.6.RELEASE/spring-boot-test-2.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.2.6.RELEASE/spring-boot-test-2.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/2.2.6.RELEASE/spring-boot-test-autoconfigure-2.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/2.2.6.RELEASE/spring-boot-test-autoconfigure-2.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/2.2.6.RELEASE/spring-boot-test-autoconfigure-2.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.data:spring-data-commons:2.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.2.6.RELEASE/spring-data-commons-2.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.2.6.RELEASE/spring-data-commons-2.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.2.6.RELEASE/spring-data-commons-2.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.data:spring-data-jpa:2.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/2.2.6.RELEASE/spring-data-jpa-2.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/2.2.6.RELEASE/spring-data-jpa-2.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/2.2.6.RELEASE/spring-data-jpa-2.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.security:spring-security-config:5.2.2.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-config/5.2.2.RELEASE/spring-security-config-5.2.2.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-config/5.2.2.RELEASE/spring-security-config-5.2.2.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-config/5.2.2.RELEASE/spring-security-config-5.2.2.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.security:spring-security-core:5.2.2.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-core/5.2.2.RELEASE/spring-security-core-5.2.2.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-core/5.2.2.RELEASE/spring-security-core-5.2.2.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-core/5.2.2.RELEASE/spring-security-core-5.2.2.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.security:spring-security-data:5.2.2.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-data/5.2.2.RELEASE/spring-security-data-5.2.2.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-data/5.2.2.RELEASE/spring-security-data-5.2.2.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-data/5.2.2.RELEASE/spring-security-data-5.2.2.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.security:spring-security-remoting:5.2.2.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-remoting/5.2.2.RELEASE/spring-security-remoting-5.2.2.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-remoting/5.2.2.RELEASE/spring-security-remoting-5.2.2.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-remoting/5.2.2.RELEASE/spring-security-remoting-5.2.2.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.security:spring-security-test:5.2.2.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-test/5.2.2.RELEASE/spring-security-test-5.2.2.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-test/5.2.2.RELEASE/spring-security-test-5.2.2.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-test/5.2.2.RELEASE/spring-security-test-5.2.2.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.security:spring-security-web:5.2.2.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-web/5.2.2.RELEASE/spring-security-web-5.2.2.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-web/5.2.2.RELEASE/spring-security-web-5.2.2.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-web/5.2.2.RELEASE/spring-security-web-5.2.2.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.session:spring-session-core:2.2.2.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/session/spring-session-core/2.2.2.RELEASE/spring-session-core-2.2.2.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/session/spring-session-core/2.2.2.RELEASE/spring-session-core-2.2.2.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/session/spring-session-core/2.2.2.RELEASE/spring-session-core-2.2.2.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.session:spring-session-jdbc:2.2.2.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/session/spring-session-jdbc/2.2.2.RELEASE/spring-session-jdbc-2.2.2.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/session/spring-session-jdbc/2.2.2.RELEASE/spring-session-jdbc-2.2.2.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/session/spring-session-jdbc/2.2.2.RELEASE/spring-session-jdbc-2.2.2.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-aop:5.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.2.5.RELEASE/spring-aop-5.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.2.5.RELEASE/spring-aop-5.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.2.5.RELEASE/spring-aop-5.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-aspects:5.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aspects/5.2.5.RELEASE/spring-aspects-5.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aspects/5.2.5.RELEASE/spring-aspects-5.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aspects/5.2.5.RELEASE/spring-aspects-5.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-beans:5.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.2.5.RELEASE/spring-beans-5.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.2.5.RELEASE/spring-beans-5.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.2.5.RELEASE/spring-beans-5.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-context:5.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.2.5.RELEASE/spring-context-5.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.2.5.RELEASE/spring-context-5.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.2.5.RELEASE/spring-context-5.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-context-support:5.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.2.5.RELEASE/spring-context-support-5.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.2.5.RELEASE/spring-context-support-5.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.2.5.RELEASE/spring-context-support-5.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-core:5.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.2.5.RELEASE/spring-core-5.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.2.5.RELEASE/spring-core-5.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.2.5.RELEASE/spring-core-5.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-expression:5.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.2.5.RELEASE/spring-expression-5.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.2.5.RELEASE/spring-expression-5.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.2.5.RELEASE/spring-expression-5.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-jcl:5.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.2.5.RELEASE/spring-jcl-5.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.2.5.RELEASE/spring-jcl-5.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.2.5.RELEASE/spring-jcl-5.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-jdbc:5.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.2.5.RELEASE/spring-jdbc-5.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.2.5.RELEASE/spring-jdbc-5.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.2.5.RELEASE/spring-jdbc-5.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-orm:5.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/5.2.5.RELEASE/spring-orm-5.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/5.2.5.RELEASE/spring-orm-5.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/5.2.5.RELEASE/spring-orm-5.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-test:5.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.2.5.RELEASE/spring-test-5.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.2.5.RELEASE/spring-test-5.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.2.5.RELEASE/spring-test-5.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-tx:5.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.2.5.RELEASE/spring-tx-5.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.2.5.RELEASE/spring-tx-5.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.2.5.RELEASE/spring-tx-5.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-web:5.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.2.5.RELEASE/spring-web-5.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.2.5.RELEASE/spring-web-5.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.2.5.RELEASE/spring-web-5.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-webmvc:5.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.2.5.RELEASE/spring-webmvc-5.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.2.5.RELEASE/spring-webmvc-5.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.2.5.RELEASE/spring-webmvc-5.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.4.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/extras/thymeleaf-extras-java8time/3.0.4.RELEASE/thymeleaf-extras-java8time-3.0.4.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/extras/thymeleaf-extras-java8time/3.0.4.RELEASE/thymeleaf-extras-java8time-3.0.4.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/extras/thymeleaf-extras-java8time/3.0.4.RELEASE/thymeleaf-extras-java8time-3.0.4.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.0.4.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/extras/thymeleaf-extras-springsecurity5/3.0.4.RELEASE/thymeleaf-extras-springsecurity5-3.0.4.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/extras/thymeleaf-extras-springsecurity5/3.0.4.RELEASE/thymeleaf-extras-springsecurity5-3.0.4.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/extras/thymeleaf-extras-springsecurity5/3.0.4.RELEASE/thymeleaf-extras-springsecurity5-3.0.4.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.thymeleaf:thymeleaf:3.0.11.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf/3.0.11.RELEASE/thymeleaf-3.0.11.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf/3.0.11.RELEASE/thymeleaf-3.0.11.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf/3.0.11.RELEASE/thymeleaf-3.0.11.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.thymeleaf:thymeleaf-spring5:3.0.11.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf-spring5/3.0.11.RELEASE/thymeleaf-spring5-3.0.11.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf-spring5/3.0.11.RELEASE/thymeleaf-spring5-3.0.11.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf-spring5/3.0.11.RELEASE/thymeleaf-spring5-3.0.11.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.thymeleaf:thymeleaf-testing:3.0.4.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf-testing/3.0.4.RELEASE/thymeleaf-testing-3.0.4.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf-testing/3.0.4.RELEASE/thymeleaf-testing-3.0.4.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf-testing/3.0.4.RELEASE/thymeleaf-testing-3.0.4.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.tukaani:xz:1.8">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/tukaani/xz/1.8/xz-1.8.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/tukaani/xz/1.8/xz-1.8-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/tukaani/xz/1.8/xz-1.8-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.unbescape:unbescape:1.1.6.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.webjars:bootstrap:4.4.1-1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/webjars/bootstrap/4.4.1-1/bootstrap-4.4.1-1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/webjars/bootstrap/4.4.1-1/bootstrap-4.4.1-1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/webjars/bootstrap/4.4.1-1/bootstrap-4.4.1-1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.webjars:ckeditor:4.14.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/webjars/ckeditor/4.14.0/ckeditor-4.14.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/webjars/ckeditor/4.14.0/ckeditor-4.14.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/webjars/ckeditor/4.14.0/ckeditor-4.14.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.webjars:font-awesome:5.13.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/webjars/font-awesome/5.13.0/font-awesome-5.13.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/webjars/font-awesome/5.13.0/font-awesome-5.13.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/webjars/font-awesome/5.13.0/font-awesome-5.13.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.webjars:jquery:3.4.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/webjars/jquery/3.4.1/jquery-3.4.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/webjars/jquery/3.4.1/jquery-3.4.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/webjars/jquery/3.4.1/jquery-3.4.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.webjars:popper.js:1.14.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/webjars/popper.js/1.14.3/popper.js-1.14.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/webjars/popper.js/1.14.3/popper.js-1.14.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/webjars/popper.js/1.14.3/popper.js-1.14.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.xmlunit:xmlunit-core:2.6.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/xmlunit/xmlunit-core/2.6.4/xmlunit-core-2.6.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/xmlunit/xmlunit-core/2.6.4/xmlunit-core-2.6.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/xmlunit/xmlunit-core/2.6.4/xmlunit-core-2.6.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.yaml:snakeyaml:1.25">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.25/snakeyaml-1.25.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.25/snakeyaml-1.25-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.25/snakeyaml-1.25-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: oro:oro:2.0.8">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/oro/oro/2.0.8/oro-2.0.8.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/oro/oro/2.0.8/oro-2.0.8-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/oro/oro/2.0.8/oro-2.0.8-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: rome:rome:1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/rome/rome/1.0/rome-1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/rome/rome/1.0/rome-1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/rome/rome/1.0/rome-1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: sslext:sslext:1.2-0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/sslext/sslext/1.2-0/sslext-1.2-0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/sslext/sslext/1.2-0/sslext-1.2-0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/sslext/sslext/1.2-0/sslext-1.2-0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: wsdl4j:wsdl4j:1.6.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/wsdl4j/wsdl4j/1.6.3/wsdl4j-1.6.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/wsdl4j/wsdl4j/1.6.3/wsdl4j-1.6.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/wsdl4j/wsdl4j/1.6.3/wsdl4j-1.6.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: xalan:xalan:2.7.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/xalan/xalan/2.7.0/xalan-2.7.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/xalan/xalan/2.7.0/xalan-2.7.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/xalan/xalan/2.7.0/xalan-2.7.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: xerces:xercesImpl:2.9.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: xml-apis:xml-apis:1.0.b2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/simpleworklist.iml" filepath="$PROJECT_DIR$/simpleworklist.iml" />
+    </modules>
+  </component>
+</project>
\ 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>
\ 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ValidationConfiguration">
+    <option name="VALIDATE_ON_BUILD" value="true" />
+    <option name="VALIDATORS">
+      <map>
+        <entry key="EJB Validator" value="true" />
+        <entry key="Faces Validator" value="true" />
+        <entry key="Hibernate Validator" value="true" />
+        <entry key="JPA Validator" value="true" />
+        <entry key="Jasper Validator" value="true" />
+        <entry key="Spring Model Validator" value="true" />
+        <entry key="Spring Web Flow" value="true" />
+        <entry key="Struts 2 Model Validator" value="true" />
+        <entry key="Struts 2 Validation Model Validator" value="true" />
+        <entry key="Web Xml Validator" value="true" />
+      </map>
+    </option>
+  </component>
+</project>
\ 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

From 572170fdb0657ef216f5fb84a780db10cb361723 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 09:27:26 +0200
Subject: [PATCH 03/47] work in progress

---
 .../resources/templates/layout/tasks.html     | 29 ++++---
 .../resources/templates/project/id/show.html  |  3 +-
 .../templates/project/root/show.html          |  3 +-
 .../templates/taskstate/completed.html        | 82 +++++++++----------
 .../resources/templates/taskstate/focus.html  | 70 ++++++++--------
 .../resources/templates/taskstate/inbox.html  |  2 +-
 .../resources/templates/taskstate/next.html   | 70 ++++++++--------
 .../templates/taskstate/scheduled.html        | 68 +++++++--------
 .../templates/taskstate/someday.html          | 70 ++++++++--------
 .../resources/templates/taskstate/today.html  | 70 ++++++++--------
 .../resources/templates/taskstate/trash.html  | 82 +++++++++----------
 .../templates/taskstate/waiting.html          | 70 ++++++++--------
 12 files changed, 308 insertions(+), 311 deletions(-)

diff --git a/src/main/resources/templates/layout/tasks.html b/src/main/resources/templates/layout/tasks.html
index 41873e10..493d8434 100644
--- a/src/main/resources/templates/layout/tasks.html
+++ b/src/main/resources/templates/layout/tasks.html
@@ -13,15 +13,14 @@
         </div>
     </div>
 
-    <!-- TODO #36 -->
-    <div th:fragment="tw-tasks-table(taskPage,myTaskState)" sec:authorize="isAuthenticated()">
+    <div th:fragment="tw-tasks-table(taskPage,myTaskState,myUrlPath)" sec:authorize="isAuthenticated()">
         <div class="container">
-            <div th:replace="this :: tw-tasks-page-table(taskPage=${taskPage},myTaskState=${myTaskState})"></div>
+            <div th:replace="this :: tw-tasks-page-table(taskPage=${taskPage},myTaskState=${myTaskState},myUrlPath=${myUrlPath})"></div>
             <div th:replace="this :: tw-tasks-pagination(page=${taskPage})"></div>
         </div>
     </div>
 
-    <div th:fragment="tw-tasks-page-table(taskPage,myTaskState)">
+    <div th:fragment="tw-tasks-page-table(taskPage,myTaskState,myUrlPath)">
         <div class="row">
                 <table class="table table-striped table-hover">
                     <thead>
@@ -56,13 +55,13 @@
                         draggable="true" ondragstart="dragTask(event)"
                         ondrop="dropTask2Task(event)" ondragover="allowDropOfTask(event)">
                         <td th:id="'task_' + ${task.id} + '_col_info_icons'" class="task_col task_col_info_icons">
-                            <a th:href="@{/taskstate/task/{id}/complete(id=${task.id})}"
+                            <a th:href="@{${myUrlPath}/task/{id}/complete(id=${task.id},myUrlPath=${myUrlPath})}"
                                th:if="${task.taskState.name() ne 'COMPLETED' and task.taskState.name() ne 'TRASHED'}"
                                class="task_col_content task_col_content_finish twtooltip" data-placement="bottom"
                                th:alt-title="#{task.col.twtooltip.infoicons.finish.task}">
                                 <i class="far fa-square"></i>
                             </a>
-                            <a th:href="@{/taskstate/task/{id}/incomplete(id=${task.id})}"
+                            <a th:href="@{${myUrlPath}/task/{id}/incomplete(id=${task.id},myUrlPath=${myUrlPath})}"
                                th:if="${task.taskState.name() eq 'COMPLETED'}"
                                class="task_col_content task_col_content_unfinish twtooltip" data-placement="bottom"
                                th:alt-title="#{task.col.twtooltip.infoicons.unfinish.task}">
@@ -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"></i>
-                            <a th:if="${task.focus}" th:href="@{/taskstate/task/{id}/unsetfocus(id=${task.id})}"
+                            <a th:if="${task.focus}" th:href="@{{myUrlPath}/task/{id}/unsetfocus(id=${task.id},myUrlPath=${myUrlPath})}"
                                class="task_col_content task_col_content_unsetfocus twtooltip" data-placement="bottom"
                                th:alt-title="#{task.col.twtooltip.infoicons.unsetfocus}"
                                th:id="'task_' + ${task.id} + '_col_unsetfocus'" draggable="true" ondragstart="dragTask(event)">
                                 <i class="fas fa-star"></i>
                             </a>
-                            <a th:if="${not task.focus}" th:href="@{/taskstate/task/{id}/setfocus(id=${task.id})}"
+                            <a th:if="${not task.focus}" th:href="@{{myUrlPath}/task/{id}/setfocus(id=${task.id},myUrlPath=${myUrlPath})}"
                                class="task_col_content task_col_content_setfocus twtooltip"
                                th:alt-title="#{task.col.twtooltip.infoicons.setfocus}"
                                th:id="'task_' + ${task.id} + '_col_setfocus'" draggable="true" ondragstart="dragTask(event)">
@@ -86,7 +85,7 @@
                             </a>
                         </td>
                         <td th:id="'task_' + ${task.id} + '_col_title'" class="task_col task_col_title">
-                            <div th:replace="this :: tw-tasks-modal(task=${task})"></div>
+                            <div th:replace="this :: tw-tasks-modal(task=${task},myUrlPath=${myUrlPath})"></div>
                         </td>
                         <td th:id="'task_' + ${task.id} + '_col_due_date'" class="task_col task_col_due_date"
                             th:if="${myTaskState eq 'SCHEDULED' or myTaskState eq 'TODAY' or myTaskState eq 'PROJECT'}">
@@ -161,7 +160,7 @@
         </div>
     </div>
 
-    <div th:fragment="tw-tasks-modal(task)">
+    <div th:fragment="tw-tasks-modal(task,myUrlPath)">
         <button type="button" data-toggle="modal"
                 class="btn btn-primary btn-sm task_col_content task_col_content_task_details twtooltip"
                 th:attr="data-target='#taskModalScrollable_'+${task.id}"
@@ -178,20 +177,20 @@
                     <div class="modal-header">
                         <h5 class="modal-title" id="taskModalScrollableTitle">
                             <a th:if="${task.taskState.name() ne 'COMPLETED' and task.taskState.name() ne 'TRASHED'}"
-                               th:href="@{/taskstate/task/complete/{id}(id=${task.id})}">
+                               th:href="@{${myUrlPath}/task/complete/{id}(id=${task.id},myUrlPath=${myUrlPath})}">
                                 <i class="far fa-square"></i>
                             </a>
                             <a th:if="${task.taskState.name() eq 'COMPLETED'}"
-                               th:href="@{/taskstate/task/incomplete/{id}(id=${task.id})}" >
+                               th:href="@{${myUrlPath}/task/incomplete/{id}(id=${task.id},myUrlPath=${myUrlPath})}" >
                                 <i class="fas fa-check-square"></i>
                             </a>
                             <i class="fas fa-trash-alt" th:if="${task.taskState.name() eq 'TRASHED'}"></i>
                             <a th:if="${task.focus}"
-                               th:href="@{/taskstate/task/unsetfocus/{id}(id=${task.id})}">
+                               th:href="@{${myUrlPath}/task/unsetfocus/{id}(id=${task.id},myUrlPath=${myUrlPath})}">
                                 <i class="fas fa-star"></i>
                             </a>
                             <a th:if="${not task.focus}"
-                               th:href="@{/taskstate/task/setfocus/{id}(id=${task.id})}">
+                               th:href="@{${myUrlPath}/task/setfocus/{id}(id=${task.id},myUrlPath=${myUrlPath})}">
                                 <i class="far fa-star"></i>
                             </a>
                             <span th:text="${task.title}">Modal title</span>
@@ -261,7 +260,7 @@ <h5 class="modal-title" id="taskModalScrollableTitle">
                     <div class="modal-footer">
                         <button type="button" class="btn btn-primary" data-dismiss="modal"
                                 th:utext="#{button.back}">Close</button>
-                        <a th:href="@{/taskstate/task/{id}/edit(id=${task.id})}" class="btn btn-secondary"
+                        <a th:href="@{{myUrlPath}/task/{id}/edit(id=${task.id},myUrlPath=${myUrlPath})}" class="btn btn-secondary"
                            role="button" th:id="'task_' + ${task.id}" th:utext="#{task.show.button.edit}">
                             task.show.button.edit
                         </a>
diff --git a/src/main/resources/templates/project/id/show.html b/src/main/resources/templates/project/id/show.html
index 45f39947..97fffe7b 100644
--- a/src/main/resources/templates/project/id/show.html
+++ b/src/main/resources/templates/project/id/show.html
@@ -55,8 +55,7 @@ <h1>
 	<div th:replace="layout/tasks :: tw-tasks-message(message=${message})">
 	</div>
 	<div th:if="${taskPage.getTotalElements() gt 0}">
-		<!-- TODO: #34 -->
-		<div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='PROJECT')">
+		<div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage}, myTaskState='PROJECT', myUrlPath=@{/project/{thisProjectId}(thisProjectId=${thisProject.id})} )">
 		</div>
 	</div>
 	<div th:if="${taskPage.getTotalElements() eq 0}">
diff --git a/src/main/resources/templates/project/root/show.html b/src/main/resources/templates/project/root/show.html
index 823a5925..c67bdb0c 100644
--- a/src/main/resources/templates/project/root/show.html
+++ b/src/main/resources/templates/project/root/show.html
@@ -33,8 +33,7 @@ <h1>
 	<div th:replace="layout/tasks :: tw-tasks-message(message=${message})">
 	</div>
 	<div th:if="${taskPage.getTotalElements() gt 0}">
-		<!-- TODO: #34 -->
-		<div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='PROJECT')">
+		<div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='PROJECT',myUrlPath='/project/root')">
 		</div>
 	</div>
 	<div th:if="${taskPage.getTotalElements() eq 0}">
diff --git a/src/main/resources/templates/taskstate/completed.html b/src/main/resources/templates/taskstate/completed.html
index 21be8716..64e28a4b 100644
--- a/src/main/resources/templates/taskstate/completed.html
+++ b/src/main/resources/templates/taskstate/completed.html
@@ -1,41 +1,41 @@
-<!DOCTYPE html>
-<html th:lang="${#locale.language}"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:th="http://www.thymeleaf.org"
-      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
-      xmlns:sd="http://www.thymeleaf.org/spring-data">
-<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
-    <title th:text="'SimpleWorklist | ' + #{tasks.completed.h1}">Title</title>
-</head>
-<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
-
-    <div th:fragment="mytwtitle">
-        <div id="tw-content-title">
-            <h1>
-                <i class="fas fa-check-square"></i>
-                <span th:utext="#{tasks.completed.h1}">Completed Tasks</span>
-            </h1>
-            <div id="tw-content-title-actionbuttons">
-                <a th:href="@{/task/move/completed/to/trash}" class="btn btn-sm btn-primary" role="button">
-                    <i class="fas fa-trash-alt"></i>
-                    <span th:utext="#{tasks.completed.delete}">Delete All Completed Tasks</span>
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div th:fragment="mytwcontent">
-        <div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
-        </div>
-        <div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
-            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='COMPLETED')">
-            </div>
-        </div>
-        <div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">
-            <p><span th:text="#{tasks.completed.noTasks}">You have no completed Tasks</span></p>
-        </div>
-    </div>
-
-
-</body>
-</html>
\ No newline at end of file
+<!DOCTYPE html>
+<html th:lang="${#locale.language}"
+      xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
+      xmlns:sd="http://www.thymeleaf.org/spring-data">
+<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
+    <title th:text="'SimpleWorklist | ' + #{tasks.completed.h1}">Title</title>
+</head>
+<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
+
+    <div th:fragment="mytwtitle">
+        <div id="tw-content-title">
+            <h1>
+                <i class="fas fa-check-square"></i>
+                <span th:utext="#{tasks.completed.h1}">Completed Tasks</span>
+            </h1>
+            <div id="tw-content-title-actionbuttons">
+                <a th:href="@{/task/move/completed/to/trash}" class="btn btn-sm btn-primary" role="button">
+                    <i class="fas fa-trash-alt"></i>
+                    <span th:utext="#{tasks.completed.delete}">Delete All Completed Tasks</span>
+                </a>
+            </div>
+        </div>
+    </div>
+
+    <div th:fragment="mytwcontent">
+        <div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
+        </div>
+        <div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
+            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='COMPLETED', myUrlPath='/taskstate')">
+            </div>
+        </div>
+        <div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">
+            <p><span th:text="#{tasks.completed.noTasks}">You have no completed Tasks</span></p>
+        </div>
+    </div>
+
+
+</body>
+</html>
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 @@
-<!DOCTYPE html>
-<html th:lang="${#locale.language}"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:th="http://www.thymeleaf.org"
-      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
-      xmlns:sd="http://www.thymeleaf.org/spring-data">
-<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
-    <title th:text="'SimpleWorklist | ' + #{tasks.focus.h1}">Title</title>
-</head>
-<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
-
-    <div th:fragment="mytwtitle">
-        <div id="tw-content-title">
-            <h1>
-                <i class="fas fa-star"></i>
-                <span th:utext="#{tasks.focus.h1}">Focus</span>
-            </h1>
-        </div>
-    </div>
-
-    <div th:fragment="mytwcontent">
-        <div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
-        </div>
-        <div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
-            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='FOCUS')">
-            </div>
-        </div>
-        <div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">
-            <p><span th:text="#{tasks.focus.noTasks}">You have no Tasks in Focus</span></p>
-        </div>
-    </div>
-
-
-</body>
-</html>
\ No newline at end of file
+<!DOCTYPE html>
+<html th:lang="${#locale.language}"
+      xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
+      xmlns:sd="http://www.thymeleaf.org/spring-data">
+<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
+    <title th:text="'SimpleWorklist | ' + #{tasks.focus.h1}">Title</title>
+</head>
+<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
+
+    <div th:fragment="mytwtitle">
+        <div id="tw-content-title">
+            <h1>
+                <i class="fas fa-star"></i>
+                <span th:utext="#{tasks.focus.h1}">Focus</span>
+            </h1>
+        </div>
+    </div>
+
+    <div th:fragment="mytwcontent">
+        <div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
+        </div>
+        <div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
+            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='FOCUS', myUrlPath='/taskstate')">
+            </div>
+        </div>
+        <div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">
+            <p><span th:text="#{tasks.focus.noTasks}">You have no Tasks in Focus</span></p>
+        </div>
+    </div>
+
+
+</body>
+</html>
diff --git a/src/main/resources/templates/taskstate/inbox.html b/src/main/resources/templates/taskstate/inbox.html
index 3dc2fb22..148705f8 100644
--- a/src/main/resources/templates/taskstate/inbox.html
+++ b/src/main/resources/templates/taskstate/inbox.html
@@ -28,7 +28,7 @@ <h1>
         <div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
         </div>
         <div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
-            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='INBOX')">
+            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='INBOX', myUrlPath='/taskstate')">
             </div>
         </div>
         <div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">
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 @@
-<!DOCTYPE html>
-<html th:lang="${#locale.language}"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:th="http://www.thymeleaf.org"
-      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
-      xmlns:sd="http://www.thymeleaf.org/spring-data">
-<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
-    <title th:text="'SimpleWorklist | ' + #{tasks.next.h1}">Title</title>
-</head>
-<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
-
-    <div th:fragment="mytwtitle">
-        <div id="tw-content-title">
-            <h1>
-                <i class="fas fa-cogs"></i>
-                <span th:utext="#{tasks.next.h1}">Next</span>
-            </h1>
-        </div>
-    </div>
-
-    <div th:fragment="mytwcontent">
-        <div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
-        </div>
-        <div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
-            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='NEXT')">
-            </div>
-        </div>
-        <div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">
-            <p><span th:text="#{tasks.next.noTasks}">You have no Tasks to do Next</span></p>
-        </div>
-    </div>
-
-
-</body>
-</html>
\ No newline at end of file
+<!DOCTYPE html>
+<html th:lang="${#locale.language}"
+      xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
+      xmlns:sd="http://www.thymeleaf.org/spring-data">
+<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
+    <title th:text="'SimpleWorklist | ' + #{tasks.next.h1}">Title</title>
+</head>
+<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
+
+    <div th:fragment="mytwtitle">
+        <div id="tw-content-title">
+            <h1>
+                <i class="fas fa-cogs"></i>
+                <span th:utext="#{tasks.next.h1}">Next</span>
+            </h1>
+        </div>
+    </div>
+
+    <div th:fragment="mytwcontent">
+        <div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
+        </div>
+        <div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
+            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='NEXT', myUrlPath='/taskstate')">
+            </div>
+        </div>
+        <div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">
+            <p><span th:text="#{tasks.next.noTasks}">You have no Tasks to do Next</span></p>
+        </div>
+    </div>
+
+
+</body>
+</html>
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 @@
-<!DOCTYPE html>
-<html th:lang="${#locale.language}"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:th="http://www.thymeleaf.org"
-      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
-      xmlns:sd="http://www.thymeleaf.org/spring-data">
-<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
-    <title th:text="'SimpleWorklist | ' + #{tasks.scheduled.h1}">Title</title>
-</head>
-<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
-
-    <div th:fragment="mytwtitle">
-        <div id="tw-content-title">
-            <h1>
-                <i class="fas fa-calendar-alt"></i>
-                <span th:utext="#{tasks.scheduled.h1}">Scheduled</span>
-            </h1>
-        </div>
-    </div>
-
-    <div th:fragment="mytwcontent">
-        <div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
-        </div>
-        <div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
-            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='SCHEDULED')">
-            </div>
-        </div>
-        <div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">
-            <p><span th:text="#{tasks.scheduled.noTasks}">You have no scheduled Tasks</span></p>
-        </div>
-    </div>
-
-</body>
-</html>
\ No newline at end of file
+<!DOCTYPE html>
+<html th:lang="${#locale.language}"
+      xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
+      xmlns:sd="http://www.thymeleaf.org/spring-data">
+<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
+    <title th:text="'SimpleWorklist | ' + #{tasks.scheduled.h1}">Title</title>
+</head>
+<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
+
+    <div th:fragment="mytwtitle">
+        <div id="tw-content-title">
+            <h1>
+                <i class="fas fa-calendar-alt"></i>
+                <span th:utext="#{tasks.scheduled.h1}">Scheduled</span>
+            </h1>
+        </div>
+    </div>
+
+    <div th:fragment="mytwcontent">
+        <div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
+        </div>
+        <div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
+            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='SCHEDULED', myUrlPath='/taskstate')">
+            </div>
+        </div>
+        <div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">
+            <p><span th:text="#{tasks.scheduled.noTasks}">You have no scheduled Tasks</span></p>
+        </div>
+    </div>
+
+</body>
+</html>
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 @@
-<!DOCTYPE html>
-<html th:lang="${#locale.language}"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:th="http://www.thymeleaf.org"
-      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
-      xmlns:sd="http://www.thymeleaf.org/spring-data">
-<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
-    <title th:text="'SimpleWorklist | ' + #{tasks.someday.h1}">Title</title>
-</head>
-<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
-
-    <div th:fragment="mytwtitle">
-        <div id="tw-content-title">
-            <h1>
-                <i class="fas fa-road"></i>
-                <span th:utext="#{tasks.someday.h1}">Someday</span>
-            </h1>
-        </div>
-    </div>
-
-    <div th:fragment="mytwcontent">
-        <div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
-        </div>
-        <div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
-            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='SOMEDAY')">
-            </div>
-        </div>
-        <div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">
-            <p><span th:text="#{tasks.someday.noTasks}">You have no Tasks for Someday</span></p>
-        </div>
-    </div>
-
-
-</body>
-</html>
\ No newline at end of file
+<!DOCTYPE html>
+<html th:lang="${#locale.language}"
+      xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
+      xmlns:sd="http://www.thymeleaf.org/spring-data">
+<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
+    <title th:text="'SimpleWorklist | ' + #{tasks.someday.h1}">Title</title>
+</head>
+<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
+
+    <div th:fragment="mytwtitle">
+        <div id="tw-content-title">
+            <h1>
+                <i class="fas fa-road"></i>
+                <span th:utext="#{tasks.someday.h1}">Someday</span>
+            </h1>
+        </div>
+    </div>
+
+    <div th:fragment="mytwcontent">
+        <div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
+        </div>
+        <div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
+            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='SOMEDAY', myUrlPath='/taskstate')">
+            </div>
+        </div>
+        <div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">
+            <p><span th:text="#{tasks.someday.noTasks}">You have no Tasks for Someday</span></p>
+        </div>
+    </div>
+
+
+</body>
+</html>
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 @@
-<!DOCTYPE html>
-<html th:lang="${#locale.language}"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:th="http://www.thymeleaf.org"
-      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
-      xmlns:sd="http://www.thymeleaf.org/spring-data">
-<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
-    <title th:text="'SimpleWorklist | ' + #{tasks.today.h1}">Title</title>
-</head>
-<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
-
-    <div th:fragment="mytwtitle">
-        <div id="tw-content-title">
-            <h1>
-                <i class="fas fa-clock"></i>
-                <span th:utext="#{tasks.today.h1}">Today</span>
-            </h1>
-        </div>
-    </div>
-
-    <div th:fragment="mytwcontent">
-        <div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
-        </div>
-        <div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
-            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='TODAY')">
-            </div>
-        </div>
-        <div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">
-            <p><span th:text="#{tasks.today.noTasks}">You have no Tasks for Today</span></p>
-        </div>
-    </div>
-
-
-</body>
-</html>
\ No newline at end of file
+<!DOCTYPE html>
+<html th:lang="${#locale.language}"
+      xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
+      xmlns:sd="http://www.thymeleaf.org/spring-data">
+<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
+    <title th:text="'SimpleWorklist | ' + #{tasks.today.h1}">Title</title>
+</head>
+<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
+
+    <div th:fragment="mytwtitle">
+        <div id="tw-content-title">
+            <h1>
+                <i class="fas fa-clock"></i>
+                <span th:utext="#{tasks.today.h1}">Today</span>
+            </h1>
+        </div>
+    </div>
+
+    <div th:fragment="mytwcontent">
+        <div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
+        </div>
+        <div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
+            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='TODAY', myUrlPath='/taskstate')">
+            </div>
+        </div>
+        <div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">
+            <p><span th:text="#{tasks.today.noTasks}">You have no Tasks for Today</span></p>
+        </div>
+    </div>
+
+
+</body>
+</html>
diff --git a/src/main/resources/templates/taskstate/trash.html b/src/main/resources/templates/taskstate/trash.html
index 59efcaf3..03fcd203 100644
--- a/src/main/resources/templates/taskstate/trash.html
+++ b/src/main/resources/templates/taskstate/trash.html
@@ -1,41 +1,41 @@
-<!DOCTYPE html>
-<html th:lang="${#locale.language}"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:th="http://www.thymeleaf.org"
-      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
-      xmlns:sd="http://www.thymeleaf.org/spring-data">
-<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
-    <title th:text="'SimpleWorklist | ' + #{tasks.trash.h1}">Title</title>
-</head>
-<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
-
-    <div th:fragment="mytwtitle">
-        <div id="tw-content-title">
-            <h1>
-                <i class="fas fa-trash-alt"></i>
-                <span th:utext="#{tasks.trash.h1}">Trash</span>
-            </h1>
-            <div id="tw-content-title-actionbuttons">
-                <a th:href="@{/task/move/trash/to/void}" class="btn btn-sm btn-primary" role="button">
-                    <i class="fas fa-trash-alt"></i>
-                    <span th:utext="#{tasks.trash.empty}">Empty Trash</span>
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div th:fragment="mytwcontent">
-        <div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
-        </div>
-        <div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
-            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='TRASHED')">
-            </div>
-        </div>
-        <div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">
-            <p><span th:text="#{tasks.trash.noTasks}">You have no deleted Tasks in your Trash</span></p>
-        </div>
-    </div>
-
-
-</body>
-</html>
\ No newline at end of file
+<!DOCTYPE html>
+<html th:lang="${#locale.language}"
+      xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
+      xmlns:sd="http://www.thymeleaf.org/spring-data">
+<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
+    <title th:text="'SimpleWorklist | ' + #{tasks.trash.h1}">Title</title>
+</head>
+<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
+
+    <div th:fragment="mytwtitle">
+        <div id="tw-content-title">
+            <h1>
+                <i class="fas fa-trash-alt"></i>
+                <span th:utext="#{tasks.trash.h1}">Trash</span>
+            </h1>
+            <div id="tw-content-title-actionbuttons">
+                <a th:href="@{/task/move/trash/to/void}" class="btn btn-sm btn-primary" role="button">
+                    <i class="fas fa-trash-alt"></i>
+                    <span th:utext="#{tasks.trash.empty}">Empty Trash</span>
+                </a>
+            </div>
+        </div>
+    </div>
+
+    <div th:fragment="mytwcontent">
+        <div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
+        </div>
+        <div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
+            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='TRASHED', myUrlPath='/taskstate')">
+            </div>
+        </div>
+        <div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">
+            <p><span th:text="#{tasks.trash.noTasks}">You have no deleted Tasks in your Trash</span></p>
+        </div>
+    </div>
+
+
+</body>
+</html>
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 @@
-<!DOCTYPE html>
-<html th:lang="${#locale.language}"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:th="http://www.thymeleaf.org"
-      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
-      xmlns:sd="http://www.thymeleaf.org/spring-data">
-<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
-    <title th:text="'SimpleWorklist | ' + #{tasks.waiting.h1}">Title</title>
-</head>
-<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
-
-    <div th:fragment="mytwtitle">
-        <div id="tw-content-title">
-            <h1>
-                <i class="fas fa-hourglass-half"></i>
-                <span th:utext="#{tasks.waiting.h1}">Waiting</span>
-            </h1>
-        </div>
-    </div>
-
-    <div th:fragment="mytwcontent">
-        <div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
-        </div>
-        <div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
-            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='WAITING')">
-            </div>
-        </div>
-        <div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">
-            <p><span th:text="#{tasks.waiting.noTasks}">You are not waiting for others</span></p>
-        </div>
-    </div>
-
-
-</body>
-</html>
\ No newline at end of file
+<!DOCTYPE html>
+<html th:lang="${#locale.language}"
+      xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
+      xmlns:sd="http://www.thymeleaf.org/spring-data">
+<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
+    <title th:text="'SimpleWorklist | ' + #{tasks.waiting.h1}">Title</title>
+</head>
+<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
+
+    <div th:fragment="mytwtitle">
+        <div id="tw-content-title">
+            <h1>
+                <i class="fas fa-hourglass-half"></i>
+                <span th:utext="#{tasks.waiting.h1}">Waiting</span>
+            </h1>
+        </div>
+    </div>
+
+    <div th:fragment="mytwcontent">
+        <div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
+        </div>
+        <div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
+            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='WAITING', myUrlPath='/taskstate')">
+            </div>
+        </div>
+        <div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">
+            <p><span th:text="#{tasks.waiting.noTasks}">You are not waiting for others</span></p>
+        </div>
+    </div>
+
+
+</body>
+</html>

From 936662dfc85bea6241f69426858e21d0625f9b9d Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 09:55:53 +0200
Subject: [PATCH 04/47] work in progress

---
 .../project/ProjectController.java            | 69 +++++++++++++++++++
 .../resources/templates/project/id/edit.html  |  2 +-
 .../templates/project/id/project/add.html     |  2 +-
 .../templates/project/id/task/add.html        |  8 ++-
 .../templates/project/id/task/edit.html       | 35 ++++++----
 .../templates/project/root/project/add.html   |  2 +-
 .../templates/project/root/task/add.html      |  5 +-
 .../templates/project/root/task/edit.html     | 21 +++---
 .../templates/taskstate/task/add.html         |  2 +-
 9 files changed, 116 insertions(+), 30 deletions(-)

diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
index 510b393d..e7e512fd 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
+++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
@@ -22,6 +22,8 @@
 import java.util.List;
 import java.util.Locale;
 
+import static org.woehlke.simpleworklist.project.Project.rootProjectId;
+
 /**
  * Created by tw on 14.02.16.
  */
@@ -351,6 +353,73 @@ 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<Context> contexts = contextService.getAllForUser(userAccount);
+        Context thisContext = task.getContext();
+        Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForTaskstate(task.getTaskState(),locale);
+        model.addAttribute("breadcrumb", breadcrumb);
+        model.addAttribute("thisProject", thisProject);
+        model.addAttribute("thisContext", thisContext);
+        model.addAttribute("task", task);
+        model.addAttribute("areas", contexts);
+        return "project/id/task/edit";
+    }
+
+    @RequestMapping(path = "/task/{taskId}/edit", method = RequestMethod.POST)
+    public final String editTaskPost(
+        @PathVariable long taskId,
+        @Valid Task task,
+        @ModelAttribute("userSession") UserSessionBean userSession,
+        BindingResult result,
+        Locale locale,
+        Model model
+    ) {
+        log.info("editTaskPost");
+        if (result.hasErrors() ) {
+            log.warn("result.hasErrors");
+            for (ObjectError e : result.getAllErrors()) {
+                log.error(e.toString());
+            }
+            UserAccount userAccount = userAccountLoginSuccessService.retrieveCurrentUser();
+            List<Context> contexts = contextService.getAllForUser(userAccount);
+            Task persistentTask = taskService.findOne(taskId);
+            persistentTask.merge(task);
+            task = persistentTask;
+            Context thisContext = task.getContext();
+            Project thisProject = new Project();
+            thisProject.setId(0L);
+            Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShowOneProject(thisProject,locale);
+            model.addAttribute("breadcrumb", breadcrumb);
+            model.addAttribute("thisProject", thisProject); //TODO: remove?
+            model.addAttribute("thisContext", thisContext);
+            model.addAttribute("task", task);
+            model.addAttribute("areas", contexts);
+            userSession.setLastProjectId(thisProject.getId());
+            userSession.setLastTaskState(task.getTaskState());
+            userSession.setLastTaskId(task.getId());
+            userSession.setLastContextId(thisContext.getId());
+            return "project/id/task/edit";
+        } else {
+            task.unsetFocus();
+            task.setRootProject();
+            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 task.getTaskState().getUrl();
+        }
+    }
+
     @RequestMapping(path = "/task/{taskId}/complete", method = RequestMethod.GET)
     public final String setDoneTaskGet(
         @PathVariable("projectId") Project thisProject,
diff --git a/src/main/resources/templates/project/id/edit.html b/src/main/resources/templates/project/id/edit.html
index ecfc2dd3..31eaac7f 100644
--- a/src/main/resources/templates/project/id/edit.html
+++ b/src/main/resources/templates/project/id/edit.html
@@ -66,7 +66,7 @@ <h1>
 	<!-- Document Window End -->
 </div>
 
-	<script th:src="@{/webjars/ckeditor/4.11.3/full/ckeditor.js}"></script>
+	<script th:src="@{/webjars/ckeditor/4.14.0/full/ckeditor.js}"></script>
 	<script th:inline="javascript">
 		CKEDITOR.replace( 'textEditor' );
 	</script>
diff --git a/src/main/resources/templates/project/id/project/add.html b/src/main/resources/templates/project/id/project/add.html
index ccc255f3..5aefca67 100644
--- a/src/main/resources/templates/project/id/project/add.html
+++ b/src/main/resources/templates/project/id/project/add.html
@@ -62,7 +62,7 @@ <h1>
 
 </div>
 
-	<script th:src="@{/webjars/ckeditor/4.11.3/full/ckeditor.js}"></script>
+	<script th:src="@{/webjars/ckeditor/4.14.0/full/ckeditor.js}"></script>
 	<script th:inline="javascript">
 		CKEDITOR.replace( 'textEditor' );
 	</script>
diff --git a/src/main/resources/templates/project/id/task/add.html b/src/main/resources/templates/project/id/task/add.html
index faa68b30..de2efa58 100644
--- a/src/main/resources/templates/project/id/task/add.html
+++ b/src/main/resources/templates/project/id/task/add.html
@@ -18,7 +18,8 @@ <h1>
 </div>
 
 <div th:fragment="mytwcontent">
-	<form id="formId" th:action="@{/project/{projectId}/task/add(projectId=${thisProject.id})}" th:object="${task}" method="post">
+	<form id="formId" method="post"
+          th:action="@{/project/{projectId}/task/add(projectId=${thisProject.id})}" th:object="${task}">
 		<input type="hidden" th:field="*{taskState}" />
 		<input type="hidden" th:field="*{context.id}" />
 		<input type="hidden" th:field="*{rowCreatedAt.time}" />
@@ -46,7 +47,8 @@ <h1>
 			<label th:for="textEditor" class="control-label">
 				<span th:utext="#{task.show.text}">Text</span>
 			</label>
-			<textarea id="textEditor" name="textEditor" rows="10" cols="50" th:field="*{text}" class="form-control" ></textarea>
+			<textarea id="textEditor" name="textEditor" rows="10" cols="50" class="form-control"
+                      th:field="*{text}" >Text</textarea>
 			<div>
 				<div th:each="err : ${#fields.errors('text')}" th:text="${err}" class="alert alert-danger">
 				</div>
@@ -106,7 +108,7 @@ <h1>
 	</form>
 </div>
 
-	<script th:src="@{/webjars/ckeditor/4.11.3/full/ckeditor.js}"></script>
+	<script th:src="@{/webjars/ckeditor/4.14.0/full/ckeditor.js}"></script>
 	<script th:inline="javascript">
 		CKEDITOR.replace( 'textEditor' );
 	</script>
diff --git a/src/main/resources/templates/project/id/task/edit.html b/src/main/resources/templates/project/id/task/edit.html
index bf693db2..8bc4ed28 100644
--- a/src/main/resources/templates/project/id/task/edit.html
+++ b/src/main/resources/templates/project/id/task/edit.html
@@ -19,7 +19,8 @@ <h1>
 
 <div th:fragment="mytwcontent">
 	<div>
-		<form id="formId" th:action="@{/project/root/task/{taskId}/edit(taskId=${task.id})}" th:object="${task}" method="post">
+		<form id="formId" th:object="${task}" method="post"
+              th:action="@{/project/{projectId}/task/{taskId}/edit(taskId=${task.id},projectId=${thisProject.id})}" >
 			<input type="hidden" th:field="*{id}" />
             <input type="hidden" th:field="*{uuid}" />
 			<input type="hidden" th:field="*{rowCreatedAt.time}" />
@@ -29,7 +30,7 @@ <h1>
 				</label>
 				<input type="text" th:field="*{title}" class="form-control" />
 				<div>
-					<div th:each="err : ${#fields.errors('title')}" th:text="${err}" class="alert alert-danger" >
+					<div class="alert alert-danger" th:each="err : ${#fields.errors('title')}" th:text="${err}">
 					</div>
 				</div>
 			</div>
@@ -43,7 +44,8 @@ <h1>
                             th:text="${#messages.msgOrNull(taskStateItem.code)}">taskStateItemCode</option>
                 </select>
                 <div>
-                    <div th:each="err : ${#fields.errors('taskState')}" th:text="${err}" class="alert alert-danger">
+                    <div class="alert alert-danger"
+                          th:each="err : ${#fields.errors('taskState')}" th:text="${err}">
                     </div>
                 </div>
             </span>
@@ -53,7 +55,8 @@ <h1>
 				</label>
 				<input id="taskDueDate" type="text" th:field="*{dueDate}" class="form-control" />
 				<div>
-					<div th:each="err : ${#fields.errors('dueDate')}" th:text="${err}" class="alert alert-danger">
+					<div class="alert alert-danger"
+                         th:each="err : ${#fields.errors('dueDate')}" th:text="${err}" >
 					</div>
 				</div>
 			</div>
@@ -61,9 +64,11 @@ <h1>
 				<label th:for="textEditor" class="control-label">
 					<span th:utext="#{task.show.text}">Text</span>
 				</label>
-				<textarea id="textEditor" name="textEditor" rows="10" cols="50" th:field="*{text}" class="form-control" ></textarea>
+				<textarea id="textEditor" name="textEditor" rows="10" cols="50" class="form-control"
+                          th:field="*{text}">Text
+                </textarea>
 				<div>
-					<div th:each="err : ${#fields.errors('text')}" th:text="${err}" class="alert alert-danger">
+					<div class="alert alert-danger" th:each="err : ${#fields.errors('text')}" th:text="${err}">
 					</div>
 				</div>
 			</div>
@@ -78,7 +83,8 @@ <h1>
 								th:text="${#messages.msgOrNull(taskEnergyItem.code)}">Wireframe</option>
 					</select>
 					<div>
-						<div th:each="err : ${#fields.errors('taskEnergy')}" th:text="${err}" class="alert alert-danger">
+						<div class="alert alert-danger"
+                              th:each="err : ${#fields.errors('taskEnergy')}" th:text="${err}">
 						</div>
 					</div>
 				</span>&nbsp;
@@ -92,7 +98,8 @@ <h1>
 								th:text="${#messages.msgOrNull(taskTimeItem.code)}">Wireframe</option>
 					</select>
 					<div>
-						<div th:each="err : ${#fields.errors('taskTime')}" th:text="${err}" class="alert alert-danger">
+						<div class="alert alert-danger"
+                             th:each="err : ${#fields.errors('taskTime')}" th:text="${err}" >
 						</div>
 					</div>
 				</span>&nbsp;
@@ -101,12 +108,13 @@ <h1>
 						<span th:utext="#{task.show.context}">Area</span>
 					</label>
 					<select th:field="*{context.id}">
-						<option th:each="areaOption : ${contexts}"
-								th:value="${areaOption.id}"
-								th:text="${locale == 'de' ? areaOption.nameDe : areaOption.nameEn}">Wireframe</option>
+						<option th:each="contextOption : ${contexts}"
+								th:value="${contextOption.id}"
+								th:text="${locale == 'de' ? contextOption.nameDe : contextOption.nameEn}">ctxO</option>
 					</select>
 					<div>
-						<div th:each="err : ${#fields.errors('context.id')}" th:text="${err}" class="alert alert-danger">
+						<div class="alert alert-danger"
+                             th:each="err : ${#fields.errors('context.id')}" th:text="${err}">
 						</div>
 					</div>
 				</span>
@@ -118,7 +126,8 @@ <h1>
 				<i class="fas fa-save"></i>
 				<span th:utext="#{task.show.button}">Save Task</span>
 			</button>
-			<a th:href="@{/task/{id}/transform(id=${task.id})}" class="btn btn-secondary" role="button">
+			<a class="btn btn-secondary" role="button"
+               th:href="@{/project/{projectId}/task/{id}/transform(id=${task.id},projectId=${thisProject.id})}">
 				<i class="fas fa-project-diagram"></i>
 				<span th:utext="#{task.show.transform}">Transform into Project</span>
 			</a>
diff --git a/src/main/resources/templates/project/root/project/add.html b/src/main/resources/templates/project/root/project/add.html
index ad3c9bb4..f44b37c2 100644
--- a/src/main/resources/templates/project/root/project/add.html
+++ b/src/main/resources/templates/project/root/project/add.html
@@ -62,7 +62,7 @@ <h1>
 
 </div>
 
-	<script th:src="@{/webjars/ckeditor/4.11.3/full/ckeditor.js}"></script>
+	<script th:src="@{/webjars/ckeditor/4.14.0/full/ckeditor.js}"></script>
 	<script th:inline="javascript">
 		CKEDITOR.replace( 'textEditor' );
 	</script>
diff --git a/src/main/resources/templates/project/root/task/add.html b/src/main/resources/templates/project/root/task/add.html
index 98df2d16..83eb6726 100644
--- a/src/main/resources/templates/project/root/task/add.html
+++ b/src/main/resources/templates/project/root/task/add.html
@@ -46,7 +46,8 @@ <h1>
 			<label th:for="textEditor" class="control-label">
 				<span th:utext="#{task.show.text}">Text</span>
 			</label>
-			<textarea id="textEditor" name="textEditor" rows="10" cols="50" th:field="*{text}" class="form-control" ></textarea>
+			<textarea id="textEditor" name="textEditor" rows="10" cols="50" class="form-control"
+                      th:field="*{text}" ></textarea>
 			<div>
 				<div th:each="err : ${#fields.errors('text')}" th:text="${err}" class="alert alert-danger">
 				</div>
@@ -106,7 +107,7 @@ <h1>
 	</form>
 </div>
 
-	<script th:src="@{/webjars/ckeditor/4.11.3/full/ckeditor.js}"></script>
+	<script th:src="@{/webjars/ckeditor/4.14.0/full/ckeditor.js}"></script>
 	<script th:inline="javascript">
 		CKEDITOR.replace( 'textEditor' );
 	</script>
diff --git a/src/main/resources/templates/project/root/task/edit.html b/src/main/resources/templates/project/root/task/edit.html
index bf693db2..31522e13 100644
--- a/src/main/resources/templates/project/root/task/edit.html
+++ b/src/main/resources/templates/project/root/task/edit.html
@@ -19,7 +19,8 @@ <h1>
 
 <div th:fragment="mytwcontent">
 	<div>
-		<form id="formId" th:action="@{/project/root/task/{taskId}/edit(taskId=${task.id})}" th:object="${task}" method="post">
+		<form id="formId" method="post"
+              th:action="@{/project/root/task/{taskId}/edit(taskId=${task.id})}" th:object="${task}">
 			<input type="hidden" th:field="*{id}" />
             <input type="hidden" th:field="*{uuid}" />
 			<input type="hidden" th:field="*{rowCreatedAt.time}" />
@@ -61,7 +62,8 @@ <h1>
 				<label th:for="textEditor" class="control-label">
 					<span th:utext="#{task.show.text}">Text</span>
 				</label>
-				<textarea id="textEditor" name="textEditor" rows="10" cols="50" th:field="*{text}" class="form-control" ></textarea>
+				<textarea id="textEditor" name="textEditor" rows="10" cols="50" class="form-control"
+                          th:field="*{text}">Text</textarea>
 				<div>
 					<div th:each="err : ${#fields.errors('text')}" th:text="${err}" class="alert alert-danger">
 					</div>
@@ -78,7 +80,8 @@ <h1>
 								th:text="${#messages.msgOrNull(taskEnergyItem.code)}">Wireframe</option>
 					</select>
 					<div>
-						<div th:each="err : ${#fields.errors('taskEnergy')}" th:text="${err}" class="alert alert-danger">
+						<div class="alert alert-danger"
+                             th:each="err : ${#fields.errors('taskEnergy')}" th:text="${err}">
 						</div>
 					</div>
 				</span>&nbsp;
@@ -92,7 +95,8 @@ <h1>
 								th:text="${#messages.msgOrNull(taskTimeItem.code)}">Wireframe</option>
 					</select>
 					<div>
-						<div th:each="err : ${#fields.errors('taskTime')}" th:text="${err}" class="alert alert-danger">
+						<div class="alert alert-danger"
+                             th:each="err : ${#fields.errors('taskTime')}" th:text="${err}">
 						</div>
 					</div>
 				</span>&nbsp;
@@ -101,12 +105,13 @@ <h1>
 						<span th:utext="#{task.show.context}">Area</span>
 					</label>
 					<select th:field="*{context.id}">
-						<option th:each="areaOption : ${contexts}"
-								th:value="${areaOption.id}"
-								th:text="${locale == 'de' ? areaOption.nameDe : areaOption.nameEn}">Wireframe</option>
+						<option th:each="contextOption : ${contexts}"
+								th:value="${contextOption.id}"
+								th:text="${locale == 'de' ? contextOption.nameDe : contextOption.nameEn}">ctxO</option>
 					</select>
 					<div>
-						<div th:each="err : ${#fields.errors('context.id')}" th:text="${err}" class="alert alert-danger">
+						<div class="alert alert-danger"
+                             th:each="err : ${#fields.errors('context.id')}" th:text="${err}">
 						</div>
 					</div>
 				</span>
diff --git a/src/main/resources/templates/taskstate/task/add.html b/src/main/resources/templates/taskstate/task/add.html
index fee2a40b..876abcfc 100644
--- a/src/main/resources/templates/taskstate/task/add.html
+++ b/src/main/resources/templates/taskstate/task/add.html
@@ -106,7 +106,7 @@ <h1>
 	</form>
 </div>
 
-	<script th:src="@{/webjars/ckeditor/4.11.3/full/ckeditor.js}"></script>
+	<script th:src="@{/webjars/ckeditor/4.14.0/full/ckeditor.js}"></script>
 	<script th:inline="javascript">
 		CKEDITOR.replace( 'textEditor' );
 	</script>

From 6a48c75891843cda218521ba6c9321d20110f2f2 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 10:00:14 +0200
Subject: [PATCH 05/47] work in progress

---
 .../org/woehlke/simpleworklist/project/ProjectController.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
index e7e512fd..61c2a310 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
+++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
@@ -364,7 +364,7 @@ public final String editTaskGet(
         UserAccount userAccount = userAccountLoginSuccessService.retrieveCurrentUser();
         List<Context> contexts = contextService.getAllForUser(userAccount);
         Context thisContext = task.getContext();
-        Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForTaskstate(task.getTaskState(),locale);
+        Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShowOneProject(thisProject,locale);
         model.addAttribute("breadcrumb", breadcrumb);
         model.addAttribute("thisProject", thisProject);
         model.addAttribute("thisContext", thisContext);
@@ -398,7 +398,7 @@ public final String editTaskPost(
             thisProject.setId(0L);
             Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShowOneProject(thisProject,locale);
             model.addAttribute("breadcrumb", breadcrumb);
-            model.addAttribute("thisProject", thisProject); //TODO: remove?
+            model.addAttribute("thisProject", thisProject);
             model.addAttribute("thisContext", thisContext);
             model.addAttribute("task", task);
             model.addAttribute("areas", contexts);

From 848c1c24674a4e4c4f434c5fd8ba1593c1eed077 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 10:17:06 +0200
Subject: [PATCH 06/47] work in progress

---
 .../project/ProjectController.java            | 34 +++++++------------
 .../project/ProjectControllerRoot.java        |  4 +--
 .../project/ProjectControllerService.java     | 27 +++++++--------
 .../project/ProjectControllerServiceImpl.java | 14 ++++----
 4 files changed, 34 insertions(+), 45 deletions(-)

diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
index 61c2a310..de01d01f 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
+++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
@@ -156,7 +156,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";
     }
 
@@ -169,15 +169,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
         );
     }
 
@@ -375,6 +374,7 @@ public final String editTaskGet(
 
     @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,
@@ -394,8 +394,6 @@ public final String editTaskPost(
             persistentTask.merge(task);
             task = persistentTask;
             Context thisContext = task.getContext();
-            Project thisProject = new Project();
-            thisProject.setId(0L);
             Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShowOneProject(thisProject,locale);
             model.addAttribute("breadcrumb", breadcrumb);
             model.addAttribute("thisProject", thisProject);
@@ -409,14 +407,14 @@ public final String editTaskPost(
             return "project/id/task/edit";
         } else {
             task.unsetFocus();
-            task.setRootProject();
+            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 task.getTaskState().getUrl();
+            return thisProject.getUrl();
         }
     }
 
@@ -455,13 +453,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)
@@ -471,13 +465,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)
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java
index 6b34f8b7..7d4b9df6 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java
+++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java
@@ -72,7 +72,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 +89,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,
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerService.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerService.java
index c7cb4597..f319f77a 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerService.java
+++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerService.java
@@ -10,7 +10,7 @@
 
 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..4a0982f4 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerServiceImpl.java
@@ -36,7 +36,7 @@ public ProjectControllerServiceImpl(ProjectService projectService, TaskService t
         this.breadcrumbService = breadcrumbService;
     }
 
-    public void addNewProject(
+    public void addNewProjectToProjectIdForm(
         long projectId,
         UserSessionBean userSession,
         Context context,
@@ -69,14 +69,14 @@ public void addNewProject(
         model.addAttribute("project", project);
     }
 
-    public String addNewProjectPersist(
+    public String addNewProjectToProjectIdPersist(
         long projectId,
         UserSessionBean userSession,
         Project project,
         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();
@@ -94,7 +94,7 @@ public String addNewProjectPersist(
             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) {
@@ -136,7 +136,7 @@ public Project getProject(long projectId, UserAccount userAccount, UserSessionBe
     }
 
     @Override
-    public void addNewProjectToRoot(
+    public void addNewProjectToProjectRootForm(
         UserSessionBean userSession,
         Context context,
         Locale locale,
@@ -155,7 +155,7 @@ public void addNewProjectToRoot(
     }
 
     @Override
-    public String addNewProjectToRootPersist(
+    public String addNewProjectToProjectRootPersist(
         UserSessionBean userSession,
         Project project,
         Context context,

From 2e90727479fc5dbece222b5c49bf6a6e81aef012 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 10:24:48 +0200
Subject: [PATCH 07/47] work in progress

---
 src/main/resources/templates/layout/tasks.html    | 12 ++++++------
 src/main/resources/templates/project/id/show.html |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/templates/layout/tasks.html b/src/main/resources/templates/layout/tasks.html
index 493d8434..811ef08d 100644
--- a/src/main/resources/templates/layout/tasks.html
+++ b/src/main/resources/templates/layout/tasks.html
@@ -55,13 +55,13 @@
                         draggable="true" ondragstart="dragTask(event)"
                         ondrop="dropTask2Task(event)" ondragover="allowDropOfTask(event)">
                         <td th:id="'task_' + ${task.id} + '_col_info_icons'" class="task_col task_col_info_icons">
-                            <a th:href="@{${myUrlPath}/task/{id}/complete(id=${task.id},myUrlPath=${myUrlPath})}"
+                            <a th:href="@{{myUrlPath}/task/{id}/complete(id=${task.id},myUrlPath=${myUrlPath})}"
                                th:if="${task.taskState.name() ne 'COMPLETED' and task.taskState.name() ne 'TRASHED'}"
                                class="task_col_content task_col_content_finish twtooltip" data-placement="bottom"
                                th:alt-title="#{task.col.twtooltip.infoicons.finish.task}">
                                 <i class="far fa-square"></i>
                             </a>
-                            <a th:href="@{${myUrlPath}/task/{id}/incomplete(id=${task.id},myUrlPath=${myUrlPath})}"
+                            <a th:href="@{{myUrlPath}/task/{id}/incomplete(id=${task.id},myUrlPath=${myUrlPath})}"
                                th:if="${task.taskState.name() eq 'COMPLETED'}"
                                class="task_col_content task_col_content_unfinish twtooltip" data-placement="bottom"
                                th:alt-title="#{task.col.twtooltip.infoicons.unfinish.task}">
@@ -177,20 +177,20 @@
                     <div class="modal-header">
                         <h5 class="modal-title" id="taskModalScrollableTitle">
                             <a th:if="${task.taskState.name() ne 'COMPLETED' and task.taskState.name() ne 'TRASHED'}"
-                               th:href="@{${myUrlPath}/task/complete/{id}(id=${task.id},myUrlPath=${myUrlPath})}">
+                               th:href="@{{myUrlPath}/task/complete/{id}(id=${task.id},myUrlPath=${myUrlPath})}">
                                 <i class="far fa-square"></i>
                             </a>
                             <a th:if="${task.taskState.name() eq 'COMPLETED'}"
-                               th:href="@{${myUrlPath}/task/incomplete/{id}(id=${task.id},myUrlPath=${myUrlPath})}" >
+                               th:href="@{{myUrlPath}/task/incomplete/{id}(id=${task.id},myUrlPath=${myUrlPath})}" >
                                 <i class="fas fa-check-square"></i>
                             </a>
                             <i class="fas fa-trash-alt" th:if="${task.taskState.name() eq 'TRASHED'}"></i>
                             <a th:if="${task.focus}"
-                               th:href="@{${myUrlPath}/task/unsetfocus/{id}(id=${task.id},myUrlPath=${myUrlPath})}">
+                               th:href="@{{myUrlPath}/task/unsetfocus/{id}(id=${task.id},myUrlPath=${myUrlPath})}">
                                 <i class="fas fa-star"></i>
                             </a>
                             <a th:if="${not task.focus}"
-                               th:href="@{${myUrlPath}/task/setfocus/{id}(id=${task.id},myUrlPath=${myUrlPath})}">
+                               th:href="@{{myUrlPath}/task/setfocus/{id}(id=${task.id},myUrlPath=${myUrlPath})}">
                                 <i class="far fa-star"></i>
                             </a>
                             <span th:text="${task.title}">Modal title</span>
diff --git a/src/main/resources/templates/project/id/show.html b/src/main/resources/templates/project/id/show.html
index 97fffe7b..f5f983b7 100644
--- a/src/main/resources/templates/project/id/show.html
+++ b/src/main/resources/templates/project/id/show.html
@@ -32,7 +32,7 @@ <h1>
                th:href="@{/project/{thisProjectId}/delete(thisProjectId=${thisProject.id})}">
 				<i class="fas fa-trash-alt"></i>
 				<span th:text="#{project.show.delete}">Delete Project</span>
-			</a>s
+			</a>
 			<a class="btn btn-sm btn-secondary" role="button" href="#"
                th:href="@{/project/{thisProjectId}/project/add(thisProjectId=${thisProject.id})}">
 				<i class="fas fa-plus-square"></i>

From e3e59196139c250996918601a8827a35daeb65a2 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 10:29:46 +0200
Subject: [PATCH 08/47] work in progress

---
 src/main/resources/templates/layout/tasks.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/templates/layout/tasks.html b/src/main/resources/templates/layout/tasks.html
index 811ef08d..89c34168 100644
--- a/src/main/resources/templates/layout/tasks.html
+++ b/src/main/resources/templates/layout/tasks.html
@@ -177,20 +177,20 @@
                     <div class="modal-header">
                         <h5 class="modal-title" id="taskModalScrollableTitle">
                             <a th:if="${task.taskState.name() ne 'COMPLETED' and task.taskState.name() ne 'TRASHED'}"
-                               th:href="@{{myUrlPath}/task/complete/{id}(id=${task.id},myUrlPath=${myUrlPath})}">
+                               th:href="@{{myUrlPath}/task/{id}/complete(id=${task.id},myUrlPath=${myUrlPath})}">
                                 <i class="far fa-square"></i>
                             </a>
                             <a th:if="${task.taskState.name() eq 'COMPLETED'}"
-                               th:href="@{{myUrlPath}/task/incomplete/{id}(id=${task.id},myUrlPath=${myUrlPath})}" >
+                               th:href="@{{myUrlPath}/task/{id}/incomplete(id=${task.id},myUrlPath=${myUrlPath})}" >
                                 <i class="fas fa-check-square"></i>
                             </a>
                             <i class="fas fa-trash-alt" th:if="${task.taskState.name() eq 'TRASHED'}"></i>
                             <a th:if="${task.focus}"
-                               th:href="@{{myUrlPath}/task/unsetfocus/{id}(id=${task.id},myUrlPath=${myUrlPath})}">
+                               th:href="@{{myUrlPath}/task/{id}/unsetfocus(id=${task.id},myUrlPath=${myUrlPath})}">
                                 <i class="fas fa-star"></i>
                             </a>
                             <a th:if="${not task.focus}"
-                               th:href="@{{myUrlPath}/task/setfocus/{id}(id=${task.id},myUrlPath=${myUrlPath})}">
+                               th:href="@{{myUrlPath}/task/{id}/setfocus(id=${task.id},myUrlPath=${myUrlPath})}">
                                 <i class="far fa-star"></i>
                             </a>
                             <span th:text="${task.title}">Modal title</span>

From 6217a734adc0c576230adb035f66d6a1859b0bab Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 10:54:44 +0200
Subject: [PATCH 09/47] work in progress

---
 .../project/ProjectController.java            | 19 +++++--
 .../project/ProjectControllerRoot.java        | 17 ++++++-
 .../task/TaskStateTaskController.java         | 15 +++++-
 .../UserSelfserviceController.java            | 49 ++++++++++---------
 4 files changed, 70 insertions(+), 30 deletions(-)

diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
index de01d01f..81c671d4 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
+++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
@@ -8,6 +8,7 @@
 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;
@@ -208,7 +209,7 @@ public final String projectEditGet(
         model.addAttribute("userSession",userSession);
         List<Context> 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);
@@ -368,7 +369,7 @@ public final String editTaskGet(
         model.addAttribute("thisProject", thisProject);
         model.addAttribute("thisContext", thisContext);
         model.addAttribute("task", task);
-        model.addAttribute("areas", contexts);
+        model.addAttribute("contexts", contexts);
         return "project/id/task/edit";
     }
 
@@ -383,6 +384,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()) {
@@ -399,7 +412,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);
             userSession.setLastProjectId(thisProject.getId());
             userSession.setLastTaskState(task.getTaskState());
             userSession.setLastTaskId(task.getId());
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java
index 7d4b9df6..3b9d9f78 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java
+++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java
@@ -9,6 +9,7 @@
 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;
@@ -200,7 +201,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 +215,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 +245,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());
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java b/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java
index 537baa5c..2d9558da 100644
--- a/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java
+++ b/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java
@@ -4,6 +4,7 @@
 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;
@@ -117,7 +118,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";
@@ -134,6 +135,16 @@ public final String editTaskPost(
         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 +168,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();
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..06befed5 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceController.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceController.java
@@ -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<Context> 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());
             }

From 7b178807840d1c3c280d0db20737fd8a62d24882 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 11:06:24 +0200
Subject: [PATCH 10/47] work in progress

---
 .../simpleworklist/config/AbstractTest.java   | 13 ++-----
 .../helper/TestHelperService.java             | 14 ++++---
 .../helper/TestHelperServiceImpl.java         | 38 +++++++++++--------
 .../UserRegistrationControllerTest.java       |  2 +-
 .../UserRegistrationServiceImplTest.java      | 10 ++---
 .../UserPasswordRecoveryControllerTest.java   |  2 +-
 6 files changed, 42 insertions(+), 37 deletions(-)

diff --git a/src/test/java/org/woehlke/simpleworklist/config/AbstractTest.java b/src/test/java/org/woehlke/simpleworklist/config/AbstractTest.java
index e737d1e2..55f49bb9 100644
--- a/src/test/java/org/woehlke/simpleworklist/config/AbstractTest.java
+++ b/src/test/java/org/woehlke/simpleworklist/config/AbstractTest.java
@@ -1,19 +1,12 @@
 package org.woehlke.simpleworklist.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.user.account.UserAccount;
 import org.woehlke.simpleworklist.user.account.UserAccountService;
@@ -92,9 +85,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/helper/TestHelperService.java b/src/test/java/org/woehlke/simpleworklist/helper/TestHelperService.java
index 8e75f608..acce6df5 100644
--- a/src/test/java/org/woehlke/simpleworklist/helper/TestHelperService.java
+++ b/src/test/java/org/woehlke/simpleworklist/helper/TestHelperService.java
@@ -5,17 +5,21 @@
 
 public interface TestHelperService {
 
-    void deleteAllRegistrationProcess();
+    void deleteAllRegistrations();
 
-    void deleteAllActionItem();
+    void deleteAllPasswordRecoveries();
 
-    void deleteAllCategory();
+    void deleteAllTasks();
+
+    void deleteAllProjects();
 
     void deleteUserAccount();
 
     int getNumberOfAllRegistrations();
 
-    UserRegistration findByEmailRegistration(String email);
+    int getNumberOfAllPasswordRecoveries();
+
+    UserRegistration findRegistrationByEmail(String email);
 
-    UserPasswordRecovery findByEmailPasswordRecovery(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/helper/TestHelperServiceImpl.java
index 8e329d52..c2d3e7f3 100644
--- a/src/test/java/org/woehlke/simpleworklist/helper/TestHelperServiceImpl.java
+++ b/src/test/java/org/woehlke/simpleworklist/helper/TestHelperServiceImpl.java
@@ -15,6 +15,8 @@
 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 +40,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<Project> 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<Project> projects = projectRepository.findAll();
+        for(Project project:projects){
+            project.setParent(null);
         }
-        projectRepository.delete(root);
+        projectRepository.saveAll(projects);
+        projectRepository.flush();
+        projectRepository.deleteAll();
     }
 
     @Override
@@ -77,12 +80,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/user/register/UserRegistrationControllerTest.java b/src/test/java/org/woehlke/simpleworklist/user/register/UserRegistrationControllerTest.java
index dcb09412..f540111d 100644
--- a/src/test/java/org/woehlke/simpleworklist/user/register/UserRegistrationControllerTest.java
+++ b/src/test/java/org/woehlke/simpleworklist/user/register/UserRegistrationControllerTest.java
@@ -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..aa2fe998 100644
--- a/src/test/java/org/woehlke/simpleworklist/user/register/UserRegistrationServiceImplTest.java
+++ b/src/test/java/org/woehlke/simpleworklist/user/register/UserRegistrationServiceImplTest.java
@@ -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..9150394e 100644
--- a/src/test/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryControllerTest.java
+++ b/src/test/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryControllerTest.java
@@ -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;

From 5ff302a98c5e5dcb2045137835369b0ccf5ebbae Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 12:05:17 +0200
Subject: [PATCH 11/47] work in progress

---
 .../simpleworklist/project/Project.java       |  30 ++--
 .../project/ProjectControllerServiceImpl.java | 103 ++++--------
 .../simpleworklist/task/TaskServiceImpl.java  |  86 +++++-----
 .../simpleworklist/task/TaskState.java        |   4 +
 .../task/TaskStateControllerServiceImpl.java  |  20 ++-
 .../testdata/TestDataServiceImpl.java         | 156 +++++++++++-------
 6 files changed, 205 insertions(+), 194 deletions(-)

diff --git a/src/main/java/org/woehlke/simpleworklist/project/Project.java b/src/main/java/org/woehlke/simpleworklist/project/Project.java
index 4081de74..7a483017 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/Project.java
+++ b/src/main/java/org/woehlke/simpleworklist/project/Project.java
@@ -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/ProjectControllerServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerServiceImpl.java
index 4a0982f4..8f9c6c92 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerServiceImpl.java
@@ -9,11 +9,12 @@
 import org.woehlke.simpleworklist.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.account.UserAccount;
 
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 import java.util.Locale;
 
@@ -37,32 +38,18 @@ public ProjectControllerServiceImpl(ProjectService projectService, TaskService t
     }
 
     public void addNewProjectToProjectIdForm(
-        long projectId,
-        UserSessionBean userSession,
-        Context context,
-        Locale locale,
-        Model model
+        @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);
@@ -70,10 +57,10 @@ public void addNewProjectToProjectIdForm(
     }
 
     public String addNewProjectToProjectIdPersist(
-        long projectId,
-        UserSessionBean userSession,
-        Project project,
-        Context context,
+        @Min(1L) long projectId,
+        @NotNull UserSessionBean userSession,
+        @NotNull Project project,
+        @NotNull Context context,
         BindingResult result,
         Locale locale,
         Model model
@@ -83,62 +70,36 @@ public String addNewProjectToProjectIdPersist(
         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 "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<Project> 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 addNewProjectToProjectRootForm(
-        UserSessionBean userSession,
-        Context context,
+        @NotNull UserSessionBean userSession,
+        @NotNull Context context,
         Locale locale,
         Model model
     ) {
@@ -156,9 +117,9 @@ public void addNewProjectToProjectRootForm(
 
     @Override
     public String addNewProjectToProjectRootPersist(
-        UserSessionBean userSession,
-        Project project,
-        Context context,
+        @NotNull UserSessionBean userSession,
+        @NotNull Project project,
+        @NotNull Context context,
         BindingResult result,
         Locale locale,
         Model model
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<Task> findbyTaskstate(TaskState taskState, Context context, Pageable request) {
+    public Page<Task> 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<Task> findbyTaskstate(TaskState taskState, Context context, Pageable
 
     @Override
     @Transactional(propagation = Propagation.REQUIRED, readOnly = true)
-    public Page<Task> findByProject(Project thisProject, Pageable request) {
+    public Page<Task> 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<Task> findByRootProject(Context context, Pageable request) {
+    public Page<Task> 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<Task> 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/TaskStateControllerServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/task/TaskStateControllerServiceImpl.java
index 95d95e1a..6cf6cfb6 100644
--- a/src/main/java/org/woehlke/simpleworklist/task/TaskStateControllerServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/task/TaskStateControllerServiceImpl.java
@@ -13,6 +13,7 @@
 import org.woehlke.simpleworklist.project.ProjectService;
 import org.woehlke.simpleworklist.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/testdata/TestDataServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/testdata/TestDataServiceImpl.java
index 6a30653a..a63dfa04 100644
--- a/src/main/java/org/woehlke/simpleworklist/testdata/TestDataServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/testdata/TestDataServiceImpl.java
@@ -1,5 +1,6 @@
 package org.woehlke.simpleworklist.testdata;
 
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -20,17 +21,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 +43,9 @@ public void createTestCategoryTreeForUserAccount(UserAccount userAccount) {
         List<Context> contexts = contextRepository.findByUserAccount(userAccount);
         Iterator<Context> 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 +60,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 +90,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 +146,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 +377,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" +

From ac0d187cb7bc68a3df350321960dd0fad3013f0e Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 12:09:04 +0200
Subject: [PATCH 12/47] work in progress

---
 .../project/ProjectControllerServiceImpl.java | 13 ++----
 .../project/ProjectServiceImpl.java           | 42 ++++++++-----------
 2 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerServiceImpl.java
index 8f9c6c92..c74ca7cd 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerServiceImpl.java
@@ -8,14 +8,11 @@
 import org.woehlke.simpleworklist.breadcrumb.Breadcrumb;
 import org.woehlke.simpleworklist.breadcrumb.BreadcrumbService;
 import org.woehlke.simpleworklist.context.Context;
-import org.woehlke.simpleworklist.context.ContextService;
-import org.woehlke.simpleworklist.task.TaskService;
 import org.woehlke.simpleworklist.session.UserSessionBean;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
-import java.util.List;
 import java.util.Locale;
 
 import static org.woehlke.simpleworklist.project.Project.rootProjectId;
@@ -25,15 +22,14 @@
 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;
     }
 
@@ -66,7 +62,6 @@ public String addNewProjectToProjectIdPersist(
         Model model
     ){
         log.info("private addNewProjectPersist projectId="+projectId+" "+project.toString());
-        UserAccount userAccount = context.getUserAccount();
         userSession.setLastProjectId(projectId);
         model.addAttribute("userSession",userSession);
         if(result.hasErrors()){
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectServiceImpl.java
index d94ee484..3cbf4e9a 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectServiceImpl.java
@@ -16,6 +16,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 +28,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<Project> findRootProjectsByUserAccount(UserAccount userAccount) {
-        return projectRepository.findByParentIsNullAndUserAccount(userAccount);
-    }
-
-    @Deprecated
-    @Override
-    public List<Project> findAllProjectsByUserAccount(UserAccount userAccount) {
-        return projectRepository.findByUserAccount(userAccount);
-    }
-     */
-
     @Override
-    public List<Project> findRootProjectsByContext(Context context) {
+    public List<Project> findRootProjectsByContext(@NotNull Context context) {
         log.info("findRootProjectsByContext");
         return projectRepository.findByParentIsNullAndContext(context);
     }
 
     @Override
-    public List<Project> findAllProjectsByContext(Context context) {
+    public List<Project> 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 +60,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 +68,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 +88,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 +109,7 @@ public Project moveProjectToAnotherContext(Project thisProject, Context newConte
         return thisProject;
     }
 
-    private List<Project> getAllChildrenOfProject(Project thisProject) {
+    private List<Project> getAllChildrenOfProject(@NotNull Project thisProject) {
         log.info("getAllChildrenOfProject");
         List<Project> retVal = new ArrayList<>();
         retVal.add(thisProject);
@@ -131,8 +123,8 @@ private List<Project> 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();

From 4c0ddb49bd29c878064ab32c256089c316930f0a Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 12:42:01 +0200
Subject: [PATCH 13/47] work in progress

---
 .../project/ProjectController.java            |   3 -
 .../org/woehlke/simpleworklist/task/Task.java |   3 +
 .../task/TaskStateTaskController.java         | 155 ++++++++----------
 .../templates/project/id/task/edit.html       |   1 +
 4 files changed, 69 insertions(+), 93 deletions(-)

diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
index 81c671d4..7a07efac 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
+++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
@@ -383,8 +383,6 @@ public final String editTaskPost(
         Locale locale,
         Model model
     ) {
-        log.info("editTaskPost");
-
         log.info("editTaskPost");
         if(task.getTaskState()==TaskState.SCHEDULED && task.getDueDate()==null){
             String objectName="task";
@@ -419,7 +417,6 @@ public final String editTaskPost(
             userSession.setLastContextId(thisContext.getId());
             return "project/id/task/edit";
         } else {
-            task.unsetFocus();
             task.setProject(thisProject);
             Task persistentTask = taskService.findOne(task.getId());
             persistentTask.merge(task);
diff --git a/src/main/java/org/woehlke/simpleworklist/task/Task.java b/src/main/java/org/woehlke/simpleworklist/task/Task.java
index 2856b42b..8463c9ff 100644
--- a/src/main/java/org/woehlke/simpleworklist/task/Task.java
+++ b/src/main/java/org/woehlke/simpleworklist/task/Task.java
@@ -18,6 +18,7 @@
 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;
@@ -109,6 +110,7 @@ public class Task extends AuditModel implements Serializable, ComparableById<Tas
     @Column(name = "description", nullable = false, length = 65535, columnDefinition="text")
     private String text;
 
+    @NotNull
     @Column(name = "focus", nullable = false)
     private Boolean focus;
 
@@ -212,6 +214,7 @@ public void moveToInbox(){
     //TODO: Due Date = Date of Today
     public void moveToToday(){
         pushTaskstate(TaskState.TODAY);
+        this.dueDate = new Date();
     }
 
     //TODO: delete Due Date
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java b/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java
index 2d9558da..3af50692 100644
--- a/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java
+++ b/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java
@@ -17,6 +17,7 @@
 import org.woehlke.simpleworklist.user.account.UserAccount;
 
 import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 import java.util.Locale;
 
@@ -69,8 +70,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
@@ -97,8 +98,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");
@@ -128,8 +129,8 @@ 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
@@ -182,9 +183,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());
@@ -195,85 +196,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)
@@ -296,7 +292,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();
@@ -306,77 +302,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/resources/templates/project/id/task/edit.html b/src/main/resources/templates/project/id/task/edit.html
index 8bc4ed28..c89bdf4c 100644
--- a/src/main/resources/templates/project/id/task/edit.html
+++ b/src/main/resources/templates/project/id/task/edit.html
@@ -23,6 +23,7 @@ <h1>
               th:action="@{/project/{projectId}/task/{taskId}/edit(taskId=${task.id},projectId=${thisProject.id})}" >
 			<input type="hidden" th:field="*{id}" />
             <input type="hidden" th:field="*{uuid}" />
+            <input type="hidden" th:field="*{focus}" />
 			<input type="hidden" th:field="*{rowCreatedAt.time}" />
 			<div class="form-group">
 				<label th:for="${#ids.next('title')}" class="control-label">

From c245f35546fae16e34a8e3d08ece786f8b5d2bd6 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 13:13:02 +0200
Subject: [PATCH 14/47] work in progress

---
 .../resources/templates/project/id/edit.html  |   8 +-
 .../templates/project/id/project/add.html     |   6 +-
 .../templates/project/id/task/add.html        |  12 +-
 .../templates/project/id/task/edit.html       |  88 ++++----
 .../templates/project/root/project/add.html   |   6 +-
 .../templates/project/root/task/add.html      |  12 +-
 .../templates/project/root/task/edit.html     |  94 ++++-----
 .../templates/taskstate/task/add.html         |  12 +-
 .../templates/taskstate/task/edit.html        |  14 +-
 .../templates/user/login/loginForm.html       |   4 +-
 .../templates/user/messages/all.html          |   4 +-
 .../user/register/registerConfirmed.html      |   6 +-
 .../templates/user/register/registerForm.html |   2 +-
 .../resetPassword/resetPasswordConfirmed.html |   4 +-
 .../user/resetPassword/resetPasswordForm.html |   2 +-
 .../user/selfservice/context/add.html         | 124 +++++------
 .../user/selfservice/context/all.html         | 194 +++++++++---------
 .../user/selfservice/context/edit.html        | 124 +++++------
 .../templates/user/selfservice/language.html  | 104 +++++-----
 .../templates/user/selfservice/name.html      | 102 ++++-----
 .../templates/user/selfservice/password.html  | 134 ++++++------
 21 files changed, 526 insertions(+), 530 deletions(-)

diff --git a/src/main/resources/templates/project/id/edit.html b/src/main/resources/templates/project/id/edit.html
index 31eaac7f..d570ff28 100644
--- a/src/main/resources/templates/project/id/edit.html
+++ b/src/main/resources/templates/project/id/edit.html
@@ -20,7 +20,7 @@ <h1>
 <div th:fragment="mytwcontent">
 	<div>
 		<form id="formId" th:action="@{/project/{id}/edit(id=${thisProject.id})}" th:object="${project}" method="post">
-			<div class="form-group">
+			<div class="form-group form-control-lg">
 				<label th:for="${#ids.next('name')}" class="control-label">Name</label>
 				<input type="text" th:field="*{name}" class="form-control" />
 				<div>
@@ -28,7 +28,7 @@ <h1>
 					</div>
 				</div>
 			</div>
-			<div class="form-group">
+			<div class="form-group form-control-lg">
 				<label th:for="textEditor" class="control-label">
 					<span th:utext="#{project.add.description}">Description</span>
 				</label>
@@ -39,9 +39,9 @@ <h1>
 				</div>
 			</div>
 			<div>
-				<div class="form-group">
+				<div class="form-group form-control-lg">
 					<label th:for="${#ids.next('context.id')}" class="control-label">
-						<span th:utext="#{project.edit.context}">Area</span>
+						<span th:utext="#{project.edit.context}">context</span>
 					</label>
 					<select th:field="*{context.id}">
 						<option th:each="context : ${contexts}"
diff --git a/src/main/resources/templates/project/id/project/add.html b/src/main/resources/templates/project/id/project/add.html
index 5aefca67..64e26ad5 100644
--- a/src/main/resources/templates/project/id/project/add.html
+++ b/src/main/resources/templates/project/id/project/add.html
@@ -20,14 +20,14 @@ <h1>
 <div th:fragment="mytwcontent">
 	<div>
 	<form id="formId" th:action="@{/project/{id}/project/add(id=${thisProject.id})}" th:object="${project}" method="post">
-		<div class="form-group">
+		<div class="form-group form-control-lg">
 			<label th:for="${#ids.next('name')}" class="control-label">Name</label>
 			<input type="text" th:field="*{name}" class="form-control" />
 			<div>
 				<div th:each="err : ${#fields.errors('name')}" th:text="${err}" class="alert alert-danger"></div>
 			</div>
 		</div>
-		<div class="form-group">
+		<div class="form-group form-control-lg">
 			<label th:for="textEditor"  class="control-label">
 				<span th:utext="#{project.add.description}">Description</span>
 			</label>
@@ -36,7 +36,7 @@ <h1>
 				<div th:each="err : ${#fields.errors('description')}" th:text="${err}" class="alert alert-danger"></div>
 			</div>
 		</div>
-		<div class="form-group">
+		<div class="form-group form-control-lg">
 			<label th:for="${#ids.next('context.id')}" class="control-label">
 				<span th:utext="#{project.edit.context}">Area</span>
 			</label>
diff --git a/src/main/resources/templates/project/id/task/add.html b/src/main/resources/templates/project/id/task/add.html
index de2efa58..99c0bcc4 100644
--- a/src/main/resources/templates/project/id/task/add.html
+++ b/src/main/resources/templates/project/id/task/add.html
@@ -23,7 +23,7 @@ <h1>
 		<input type="hidden" th:field="*{taskState}" />
 		<input type="hidden" th:field="*{context.id}" />
 		<input type="hidden" th:field="*{rowCreatedAt.time}" />
-		<div class="form-group">
+		<div class="form-group form-control-lg">
 			<label th:for="${#ids.next('title')}" class="control-label">
 				<span th:utext="#{task.show.title}">Title</span>
 			</label>
@@ -33,7 +33,7 @@ <h1>
 				</div>
 			</div>
 		</div>
-		<div class="form-group">
+		<div class="form-group form-control-lg">
 			<label for="taskDueDate" class="control-label">
 				<span th:utext="#{task.show.dueDate}">Due Date</span>
 			</label>
@@ -43,7 +43,7 @@ <h1>
 				</div>
 			</div>
 		</div>
-		<div class="form-group">
+		<div class="form-group form-control-lg">
 			<label th:for="textEditor" class="control-label">
 				<span th:utext="#{task.show.text}">Text</span>
 			</label>
@@ -55,7 +55,7 @@ <h1>
 			</div>
 		</div>
 		<div>
-			<span class="form-group">
+			<span class="form-group form-control-lg">
 				<label th:for="${#ids.next('taskEnergy')}" class="control-label">
 					<span th:utext="#{task.show.taskEnergy}">Energy</span>
 				</label>
@@ -69,7 +69,7 @@ <h1>
 					</div>
 				</div>
 			</span>&nbsp;
-			<span class="form-group">
+			<span class="form-group form-control-lg">
 				<label th:for="${#ids.next('taskTime')}" class="control-label">
 					<span th:utext="#{task.show.taskTime}">Time</span>
 				</label>
@@ -83,7 +83,7 @@ <h1>
 					</div>
 				</div>
 			</span>&nbsp;
-			<span class="form-group">
+			<span class="form-group form-control-lg">
 				<label th:for="${#ids.next('context.id')}" class="control-label">
 					<span th:utext="#{task.show.context}">Area</span>
 				</label>
diff --git a/src/main/resources/templates/project/id/task/edit.html b/src/main/resources/templates/project/id/task/edit.html
index c89bdf4c..35ff8db8 100644
--- a/src/main/resources/templates/project/id/task/edit.html
+++ b/src/main/resources/templates/project/id/task/edit.html
@@ -25,99 +25,95 @@ <h1>
             <input type="hidden" th:field="*{uuid}" />
             <input type="hidden" th:field="*{focus}" />
 			<input type="hidden" th:field="*{rowCreatedAt.time}" />
-			<div class="form-group">
+			<div class="form-group form-control-lg">
+                <div th:each="err : ${#fields.errors('title')}">
+                    <div class="alert alert-danger" th:text="${err}" >err</div>
+                </div>
 				<label th:for="${#ids.next('title')}" class="control-label">
 					<span th:utext="#{task.show.title}">Title</span>
 				</label>
 				<input type="text" th:field="*{title}" class="form-control" />
-				<div>
-					<div class="alert alert-danger" th:each="err : ${#fields.errors('title')}" th:text="${err}">
-					</div>
-				</div>
 			</div>
-            <span class="form-group">
+            <span class="form-group form-control-lg">
+                <div th:each="err : ${#fields.errors('taskState')}">
+                    <div class="alert alert-danger" th:text="${err}" >err</div>
+                </div>
                 <label th:for="${#ids.next('listTaskState')}" class="control-label">
                     <span th:utext="#{tasks.col.taskState}">taskState</span>
                 </label>
                 <select th:field="*{taskState}">
                     <option th:each="taskStateItem : ${listTaskState}"
                             th:value="${taskStateItem.value}"
-                            th:text="${#messages.msgOrNull(taskStateItem.code)}">taskStateItemCode</option>
+                            th:text="${#messages.msgOrNull(taskStateItem.code)}">
+                        taskStateItem
+                    </option>
                 </select>
-                <div>
-                    <div class="alert alert-danger"
-                          th:each="err : ${#fields.errors('taskState')}" th:text="${err}">
-                    </div>
-                </div>
             </span>
-			<div class="form-group">
+			<div class="form-group form-control-lg">
+                <div th:each="err : ${#fields.errors('dueDate')}">
+                    <div class="alert alert-danger" th:text="${err}" >err</div>
+                </div>
 				<label for="taskDueDate" class="control-label">
-					<span th:utext="#{task.show.dueDate}">Due Date</span>
+					<span th:utext="#{task.show.dueDate}">dueDate</span>
 				</label>
 				<input id="taskDueDate" type="text" th:field="*{dueDate}" class="form-control" />
-				<div>
-					<div class="alert alert-danger"
-                         th:each="err : ${#fields.errors('dueDate')}" th:text="${err}" >
-					</div>
-				</div>
 			</div>
-			<div class="form-group">
+			<div class="form-group form-control-lg">
+                <div th:each="err : ${#fields.errors('text')}">
+                    <div class="alert alert-danger" th:text="${err}" >err</div>
+                </div>
 				<label th:for="textEditor" class="control-label">
 					<span th:utext="#{task.show.text}">Text</span>
 				</label>
 				<textarea id="textEditor" name="textEditor" rows="10" cols="50" class="form-control"
                           th:field="*{text}">Text
                 </textarea>
-				<div>
-					<div class="alert alert-danger" th:each="err : ${#fields.errors('text')}" th:text="${err}">
-					</div>
-				</div>
 			</div>
 			<div>
-				<span class="form-group">
+				<span class="form-group form-control-lg">
+                    <div th:each="err : ${#fields.errors('taskEnergy')}">
+                        <div class="alert alert-danger" th:text="${err}" >err</div>
+                    </div>
 					<label th:for="${#ids.next('taskEnergy')}" class="control-label">
-						<span th:utext="#{task.show.taskEnergy}">Energy</span>
+						<span th:utext="#{task.show.taskEnergy}">taskEnergy</span>
 					</label>
 					<select th:field="*{taskEnergy}">
 						<option th:each="taskEnergyItem : ${listTaskEnergy}"
 								th:value="${taskEnergyItem.value}"
-								th:text="${#messages.msgOrNull(taskEnergyItem.code)}">Wireframe</option>
+								th:text="${#messages.msgOrNull(taskEnergyItem.code)}">
+                            taskEnergyItem
+                        </option>
 					</select>
-					<div>
-						<div class="alert alert-danger"
-                              th:each="err : ${#fields.errors('taskEnergy')}" th:text="${err}">
-						</div>
-					</div>
 				</span>&nbsp;
-				<span class="form-group">
+				<span class="form-group form-control-lg">
+                    <div th:each="err : ${#fields.errors('taskEnergy')}">
+                        <div class="alert alert-danger" th:text="${err}" >err</div>
+                    </div>
 					<label th:for="${#ids.next('taskTime')}" class="control-label">
 						<span th:utext="#{task.show.taskTime}">Time</span>
 					</label>
 					<select th:field="*{taskTime}">
 						<option th:each="taskTimeItem : ${listTaskTime}"
 								th:value="${taskTimeItem.value}"
-								th:text="${#messages.msgOrNull(taskTimeItem.code)}">Wireframe</option>
+								th:text="${#messages.msgOrNull(taskTimeItem.code)}">
+                            taskTimeItem
+                        </option>
 					</select>
-					<div>
-						<div class="alert alert-danger"
-                             th:each="err : ${#fields.errors('taskTime')}" th:text="${err}" >
-						</div>
-					</div>
 				</span>&nbsp;
-				<span class="form-group">
+				<span class="form-group form-control-lg">
+                    <div th:each="err : ${#fields.errors('context.id')}">
+                        <div class="alert alert-danger" th:text="${err}" >err</div>
+                    </div>
 					<label th:for="${#ids.next('context.id')}" class="control-label">
 						<span th:utext="#{task.show.context}">Area</span>
 					</label>
 					<select th:field="*{context.id}">
 						<option th:each="contextOption : ${contexts}"
 								th:value="${contextOption.id}"
-								th:text="${locale == 'de' ? contextOption.nameDe : contextOption.nameEn}">ctxO</option>
+								th:text="${locale == 'de' ? contextOption.nameDe : contextOption.nameEn}">
+                            contextOption
+                        </option>
 					</select>
-					<div>
-						<div class="alert alert-danger"
-                             th:each="err : ${#fields.errors('context.id')}" th:text="${err}">
-						</div>
-					</div>
 				</span>
 			</div>
             <input type="hidden"
diff --git a/src/main/resources/templates/project/root/project/add.html b/src/main/resources/templates/project/root/project/add.html
index f44b37c2..733759db 100644
--- a/src/main/resources/templates/project/root/project/add.html
+++ b/src/main/resources/templates/project/root/project/add.html
@@ -20,14 +20,14 @@ <h1>
 <div th:fragment="mytwcontent">
 	<div>
 	<form id="formId" th:action="@{/project/root/project/add}" th:object="${project}" method="post">
-		<div class="form-group">
+		<div class="form-group form-control-lg">
 			<label th:for="${#ids.next('name')}" class="control-label">Name</label>
 			<input type="text" th:field="*{name}" class="form-control" />
 			<div>
 				<div th:each="err : ${#fields.errors('name')}" th:text="${err}" class="alert alert-danger"></div>
 			</div>
 		</div>
-		<div class="form-group">
+		<div class="form-group form-control-lg">
 			<label th:for="textEditor"  class="control-label">
 				<span th:utext="#{project.add.description}">Description</span>
 			</label>
@@ -36,7 +36,7 @@ <h1>
 				<div th:each="err : ${#fields.errors('description')}" th:text="${err}" class="alert alert-danger"></div>
 			</div>
 		</div>
-		<div class="form-group">
+		<div class="form-group form-control-lg">
 			<label th:for="${#ids.next('context.id')}" class="control-label">
 				<span th:utext="#{project.edit.context}">Area</span>
 			</label>
diff --git a/src/main/resources/templates/project/root/task/add.html b/src/main/resources/templates/project/root/task/add.html
index 83eb6726..623ea884 100644
--- a/src/main/resources/templates/project/root/task/add.html
+++ b/src/main/resources/templates/project/root/task/add.html
@@ -22,7 +22,7 @@ <h1>
 		<input type="hidden" th:field="*{taskState}" />
 		<input type="hidden" th:field="*{context.id}" />
 		<input type="hidden" th:field="*{rowCreatedAt.time}" />
-		<div class="form-group">
+		<div class="form-group form-control-lg">
 			<label th:for="${#ids.next('title')}" class="control-label">
 				<span th:utext="#{task.show.title}">Title</span>
 			</label>
@@ -32,7 +32,7 @@ <h1>
 				</div>
 			</div>
 		</div>
-		<div class="form-group">
+		<div class="form-group form-control-lg">
 			<label for="taskDueDate" class="control-label">
 				<span th:utext="#{task.show.dueDate}">Due Date</span>
 			</label>
@@ -42,7 +42,7 @@ <h1>
 				</div>
 			</div>
 		</div>
-		<div class="form-group">
+		<div class="form-group form-control-lg">
 			<label th:for="textEditor" class="control-label">
 				<span th:utext="#{task.show.text}">Text</span>
 			</label>
@@ -54,7 +54,7 @@ <h1>
 			</div>
 		</div>
 		<div>
-			<span class="form-group">
+			<span class="form-group form-control-lg">
 				<label th:for="${#ids.next('taskEnergy')}" class="control-label">
 					<span th:utext="#{task.show.taskEnergy}">Energy</span>
 				</label>
@@ -68,7 +68,7 @@ <h1>
 					</div>
 				</div>
 			</span>&nbsp;
-			<span class="form-group">
+			<span class="form-group form-control-lg">
 				<label th:for="${#ids.next('taskTime')}" class="control-label">
 					<span th:utext="#{task.show.taskTime}">Time</span>
 				</label>
@@ -82,7 +82,7 @@ <h1>
 					</div>
 				</div>
 			</span>&nbsp;
-			<span class="form-group">
+			<span class="form-group form-control-lg">
 				<label th:for="${#ids.next('context.id')}" class="control-label">
 					<span th:utext="#{task.show.context}">Area</span>
 				</label>
diff --git a/src/main/resources/templates/project/root/task/edit.html b/src/main/resources/templates/project/root/task/edit.html
index 31522e13..62c8cf10 100644
--- a/src/main/resources/templates/project/root/task/edit.html
+++ b/src/main/resources/templates/project/root/task/edit.html
@@ -24,96 +24,96 @@ <h1>
 			<input type="hidden" th:field="*{id}" />
             <input type="hidden" th:field="*{uuid}" />
 			<input type="hidden" th:field="*{rowCreatedAt.time}" />
-			<div class="form-group">
+			<div class="form-group form-control-lg">
+                <div th:each="err : ${#fields.errors('title')}">
+                    <div class="alert alert-danger" th:text="${err}" >err</div>
+                </div>
 				<label th:for="${#ids.next('title')}" class="control-label">
 					<span th:utext="#{task.show.title}">Title</span>
 				</label>
 				<input type="text" th:field="*{title}" class="form-control" />
-				<div>
-					<div th:each="err : ${#fields.errors('title')}" th:text="${err}" class="alert alert-danger" >
-					</div>
-				</div>
 			</div>
-            <span class="form-group">
+            <span class="form-group form-control-lg">
+                <div th:each="err : ${#fields.errors('taskState')}">
+                    <div class="alert alert-danger" th:text="${err}" >err</div>
+                </div>
                 <label th:for="${#ids.next('listTaskState')}" class="control-label">
                     <span th:utext="#{tasks.col.taskState}">taskState</span>
                 </label>
                 <select th:field="*{taskState}">
                     <option th:each="taskStateItem : ${listTaskState}"
                             th:value="${taskStateItem.value}"
-                            th:text="${#messages.msgOrNull(taskStateItem.code)}">taskStateItemCode</option>
+                            th:text="${#messages.msgOrNull(taskStateItem.code)}">
+                        taskStateItem.code
+                    </option>
                 </select>
-                <div>
-                    <div th:each="err : ${#fields.errors('taskState')}" th:text="${err}" class="alert alert-danger">
-                    </div>
-                </div>
             </span>
-			<div class="form-group">
+			<div class="form-group form-control-lg">
+                <div th:each="err : ${#fields.errors('dueDate')}">
+                    <div class="alert alert-danger" th:text="${err}" >err</div>
+                </div>
 				<label for="taskDueDate" class="control-label">
-					<span th:utext="#{task.show.dueDate}">Due Date</span>
+					<span th:utext="#{task.show.dueDate}">dueDate</span>
 				</label>
 				<input id="taskDueDate" type="text" th:field="*{dueDate}" class="form-control" />
-				<div>
-					<div th:each="err : ${#fields.errors('dueDate')}" th:text="${err}" class="alert alert-danger">
-					</div>
-				</div>
 			</div>
-			<div class="form-group">
+			<div class="form-group form-control-lg">
+                <div th:each="err : ${#fields.errors('text')}">
+                    <div class="alert alert-danger" th:text="${err}" >err</div>
+                </div>
 				<label th:for="textEditor" class="control-label">
 					<span th:utext="#{task.show.text}">Text</span>
 				</label>
 				<textarea id="textEditor" name="textEditor" rows="10" cols="50" class="form-control"
-                          th:field="*{text}">Text</textarea>
-				<div>
-					<div th:each="err : ${#fields.errors('text')}" th:text="${err}" class="alert alert-danger">
-					</div>
-				</div>
+                          th:field="*{text}">
+                    Text
+                </textarea>
 			</div>
 			<div>
-				<span class="form-group">
+				<span class="form-group form-control-lg">
+                    <div th:each="err : ${#fields.errors('taskEnergy')}">
+                        <div class="alert alert-danger" th:text="${err}" >err</div>
+                    </div>
 					<label th:for="${#ids.next('taskEnergy')}" class="control-label">
-						<span th:utext="#{task.show.taskEnergy}">Energy</span>
+						<span th:utext="#{task.show.taskEnergy}">taskEnergy</span>
 					</label>
 					<select th:field="*{taskEnergy}">
 						<option th:each="taskEnergyItem : ${listTaskEnergy}"
 								th:value="${taskEnergyItem.value}"
-								th:text="${#messages.msgOrNull(taskEnergyItem.code)}">Wireframe</option>
+								th:text="${#messages.msgOrNull(taskEnergyItem.code)}">
+                            taskEnergyItem.code
+                        </option>
 					</select>
-					<div>
-						<div class="alert alert-danger"
-                             th:each="err : ${#fields.errors('taskEnergy')}" th:text="${err}">
-						</div>
-					</div>
 				</span>&nbsp;
-				<span class="form-group">
+				<span class="form-group form-control-lg">
+                    <div th:each="err : ${#fields.errors('taskEnergy')}">
+                        <div class="alert alert-danger" th:text="${err}" >err</div>
+                    </div>
 					<label th:for="${#ids.next('taskTime')}" class="control-label">
-						<span th:utext="#{task.show.taskTime}">Time</span>
+						<span th:utext="#{task.show.taskTime}">taskTime</span>
 					</label>
 					<select th:field="*{taskTime}">
 						<option th:each="taskTimeItem : ${listTaskTime}"
 								th:value="${taskTimeItem.value}"
-								th:text="${#messages.msgOrNull(taskTimeItem.code)}">Wireframe</option>
+								th:text="${#messages.msgOrNull(taskTimeItem.code)}">
+                            taskTimeItem.code
+                        </option>
 					</select>
-					<div>
-						<div class="alert alert-danger"
-                             th:each="err : ${#fields.errors('taskTime')}" th:text="${err}">
-						</div>
-					</div>
 				</span>&nbsp;
-				<span class="form-group">
+				<span class="form-group form-control-lg">
+                    <div th:each="err : ${#fields.errors('context.id')}">
+                        <div class="alert alert-danger" th:text="${err}" >err</div>
+                    </div>
 					<label th:for="${#ids.next('context.id')}" class="control-label">
-						<span th:utext="#{task.show.context}">Area</span>
+						<span th:utext="#{task.show.context}">context</span>
 					</label>
 					<select th:field="*{context.id}">
 						<option th:each="contextOption : ${contexts}"
 								th:value="${contextOption.id}"
-								th:text="${locale == 'de' ? contextOption.nameDe : contextOption.nameEn}">ctxO</option>
+								th:text="${locale == 'de' ? contextOption.nameDe : contextOption.nameEn}">
+                            contextOption
+                        </option>
 					</select>
-					<div>
-						<div class="alert alert-danger"
-                             th:each="err : ${#fields.errors('context.id')}" th:text="${err}">
-						</div>
-					</div>
 				</span>
 			</div>
             <input type="hidden"
diff --git a/src/main/resources/templates/taskstate/task/add.html b/src/main/resources/templates/taskstate/task/add.html
index 876abcfc..a0eb94dc 100644
--- a/src/main/resources/templates/taskstate/task/add.html
+++ b/src/main/resources/templates/taskstate/task/add.html
@@ -22,7 +22,7 @@ <h1>
 		<input type="hidden" th:field="*{taskState}" />
 		<input type="hidden" th:field="*{context.id}" />
 		<input type="hidden" th:field="*{rowCreatedAt.time}" />
-		<div class="form-group">
+		<div class="form-group form-control-lg">
 			<label th:for="${#ids.next('title')}" class="control-label">
 				<span th:utext="#{task.show.title}">Title</span>
 			</label>
@@ -32,7 +32,7 @@ <h1>
 				</div>
 			</div>
 		</div>
-		<div class="form-group">
+		<div class="form-group form-control-lg">
 			<label for="taskDueDate" class="control-label">
 				<span th:utext="#{task.show.dueDate}">Due Date</span>
 			</label>
@@ -42,7 +42,7 @@ <h1>
 				</div>
 			</div>
 		</div>
-		<div class="form-group">
+		<div class="form-group form-control-lg">
 			<label th:for="textEditor" class="control-label">
 				<span th:utext="#{task.show.text}">Text</span>
 			</label>
@@ -53,7 +53,7 @@ <h1>
 			</div>
 		</div>
 		<div>
-			<span class="form-group">
+			<span class="form-group form-control-lg">
 				<label th:for="${#ids.next('taskEnergy')}" class="control-label">
 					<span th:utext="#{task.show.taskEnergy}">Energy</span>
 				</label>
@@ -67,7 +67,7 @@ <h1>
 					</div>
 				</div>
 			</span>&nbsp;
-			<span class="form-group">
+			<span class="form-group form-control-lg">
 				<label th:for="${#ids.next('taskTime')}" class="control-label">
 					<span th:utext="#{task.show.taskTime}">Time</span>
 				</label>
@@ -81,7 +81,7 @@ <h1>
 					</div>
 				</div>
 			</span>&nbsp;
-			<span class="form-group">
+			<span class="form-group form-control-lg">
 				<label th:for="${#ids.next('context.id')}" class="control-label">
 					<span th:utext="#{task.show.context}">Area</span>
 				</label>
diff --git a/src/main/resources/templates/taskstate/task/edit.html b/src/main/resources/templates/taskstate/task/edit.html
index de598b06..d9d3e448 100644
--- a/src/main/resources/templates/taskstate/task/edit.html
+++ b/src/main/resources/templates/taskstate/task/edit.html
@@ -23,7 +23,7 @@ <h1>
 			<input type="hidden" th:field="*{id}" />
             <input type="hidden" th:field="*{uuid}" />
 			<input type="hidden" th:field="*{rowCreatedAt.time}" />
-			<div class="form-group">
+			<div class="form-group form-control-lg">
 				<label th:for="${#ids.next('title')}" class="control-label">
 					<span th:utext="#{task.show.title}">Title</span>
 				</label>
@@ -33,7 +33,7 @@ <h1>
 					</div>
 				</div>
 			</div>
-            <span class="form-group">
+            <span class="form-group form-control-lg">
                 <label th:for="${#ids.next('listTaskState')}" class="control-label">
                     <span th:utext="#{tasks.col.taskState}">taskState</span>
                 </label>
@@ -47,7 +47,7 @@ <h1>
                     </div>
                 </div>
             </span>
-			<div class="form-group">
+			<div class="form-group form-control-lg">
 				<label for="taskDueDate" class="control-label">
 					<span th:utext="#{task.show.dueDate}">Due Date</span>
 				</label>
@@ -57,7 +57,7 @@ <h1>
 					</div>
 				</div>
 			</div>
-			<div class="form-group">
+			<div class="form-group form-control-lg">
 				<label th:for="textEditor" class="control-label">
 					<span th:utext="#{task.show.text}">Text</span>
 				</label>
@@ -68,7 +68,7 @@ <h1>
 				</div>
 			</div>
 			<div>
-				<span class="form-group">
+				<span class="form-group form-control-lg">
 					<label th:for="${#ids.next('taskEnergy')}" class="control-label">
 						<span th:utext="#{task.show.taskEnergy}">Energy</span>
 					</label>
@@ -82,7 +82,7 @@ <h1>
 						</div>
 					</div>
 				</span>&nbsp;
-				<span class="form-group">
+				<span class="form-group form-control-lg">
 					<label th:for="${#ids.next('taskTime')}" class="control-label">
 						<span th:utext="#{task.show.taskTime}">Time</span>
 					</label>
@@ -96,7 +96,7 @@ <h1>
 						</div>
 					</div>
 				</span>&nbsp;
-				<span class="form-group">
+				<span class="form-group form-control-lg">
 					<label th:for="${#ids.next('context.id')}" class="control-label">
 						<span th:utext="#{task.show.context}">Area</span>
 					</label>
diff --git a/src/main/resources/templates/user/login/loginForm.html b/src/main/resources/templates/user/login/loginForm.html
index 098a936e..e48a757c 100644
--- a/src/main/resources/templates/user/login/loginForm.html
+++ b/src/main/resources/templates/user/login/loginForm.html
@@ -30,11 +30,11 @@ <h2><span th:utext="#{user.loginForm.h2}">Your Todo-List for Getting Things Done
 					<input type="hidden"
 						   name="${_csrf.parameterName}"
 						   value="${_csrf.token}"/>
-					<div class="form-group">
+					<div class="form-group form-control-lg">
 						<label for="j_username">Email</label>
 						<input id="j_username" type="email" name="j_username" class="form-control" placeholder="Enter email"/>
 					</div>
-					<div class="form-group">
+					<div class="form-group form-control-lg">
 						<label for="j_password" th:text="#{user.loginForm.password}">Password</label>
 						<input id="j_password" type="password" name="j_password" class="form-control" placeholder="Password"/>
 					</div>
diff --git a/src/main/resources/templates/user/messages/all.html b/src/main/resources/templates/user/messages/all.html
index 00ec20b8..4cddba33 100644
--- a/src/main/resources/templates/user/messages/all.html
+++ b/src/main/resources/templates/user/messages/all.html
@@ -38,7 +38,7 @@ <h1>
             <div class="col">
                 <div class="card card-body">
                     <form id="formId" th:action="@{/user2user/{userId}/messages/(userId=${otherUser.id})}" th:object="${user2UserMessageFormBean}" method="post">
-                        <div class="form-group">
+                        <div class="form-group form-control-lg">
                             <label for="textEditor" class="control-label">
                                 <span th:utext="#{pages.user2UserMessages.newMessage}">New Message:</span>
                             </label>
@@ -49,7 +49,7 @@ <h1>
                                      th:text="${err}" class="alert alert-danger" />
                             </div>
                         </div>
-                        <div class="form-group">
+                        <div class="form-group form-control-lg">
                         </div>
                         <button id="newUserMessageButton" type="submit" class="btn btn-primary">
                             <i class="fas fa-envelope"></i>
diff --git a/src/main/resources/templates/user/register/registerConfirmed.html b/src/main/resources/templates/user/register/registerConfirmed.html
index 24953636..1df17f4a 100644
--- a/src/main/resources/templates/user/register/registerConfirmed.html
+++ b/src/main/resources/templates/user/register/registerConfirmed.html
@@ -19,7 +19,7 @@ <h1>
 	<div class="card card-body">
 		<form id="formId" th:action="@{/user/register/confirm/{confirmId}(confirmId=${confirmId})}" th:object="${userAccountForm}" method="post">
 			<input type="hidden" th:field="*{userEmail}" />
-			<div class="form-group">
+			<div class="form-group form-control-lg">
 				<label th:for="${#ids.next('userFullname')}" class="control-label">
 					<span th:utext="#{user.registerConfirmed.userFullname}">Full Name</span>
 				</label>
@@ -29,7 +29,7 @@ <h1>
 					</div>
 				</div>
 			</div>
-			<div class="form-group">
+			<div class="form-group form-control-lg">
 				<label th:for="${#ids.next('userPassword')}" class="control-label">
 					<span th:utext="#{user.registerConfirmed.userPassword}">Password</span>
 				</label>
@@ -39,7 +39,7 @@ <h1>
 					</div>
 				</div>
 			</div>
-			<div class="form-group">
+			<div class="form-group form-control-lg">
 				<label th:for="${#ids.next('userPasswordConfirmation')}" class="control-label">
 					<span th:utext="#{user.registerConfirmed.userPasswordConfirmation}">Password again</span>
 				</label>
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 @@ <h1>
 	<div th:fragment="mytwcontent">
 		<div class="card card-body">
 			<form id="formId" th:action="@{/user/register}" th:object="${userRegistrationForm}" method="post">
-				<div class="form-group">
+				<div class="form-group form-control-lg">
 					<label th:for="${#ids.next('email')}" class="control-label">Email</label>
 					<input type="email" th:field="*{email}" class="form-control" />
 					<div>
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 @@ <h1>
             <form th:action="@{/user/resetPassword/confirm/{confirmId}(confirmId=${confirmId})}" th:object="${userAccountForm}" method="post">
                 <input type="hidden" th:field="*{userFullname}" />
                 <input type="hidden" th:field="*{userEmail}" />
-                <div class="form-group">
+                <div class="form-group form-control-lg">
                     <label th:for="${#ids.next('userPassword')}" class="control-label">
                         <span th:utext="#{user.registerConfirmed.userPassword}">Password</span>
                     </label>
@@ -30,7 +30,7 @@ <h1>
                         </div>
                     </div>
                 </div>
-                <div class="form-group">
+                <div class="form-group form-control-lg">
                     <label th:for="${#ids.next('userPasswordConfirmation')}" class="control-label">
                         <span th:utext="#{user.registerConfirmed.userPasswordConfirmation}">Password again</span>
                     </label>
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 @@ <h1>
     <div th:fragment="mytwcontent">
         <div class="card card-body">
             <form id="formId" th:action="@{/user/resetPassword}" th:object="${userRegistrationForm}" method="post">
-                <div class="form-group">
+                <div class="form-group form-control-lg">
                     <label th:for="${#ids.next('email')}" class="control-label">Email</label>
                     <input type="email" th:field="*{email}" class="form-control" />
                     <div>
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 @@
-<!DOCTYPE html>
-<html th:lang="${#locale.language}"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:th="http://www.thymeleaf.org"
-      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
-      xmlns:sd="http://www.thymeleaf.org/spring-data">
-<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
-    <title th:text="'SimpleWorklist | ' + #{user.selfservice.contexts.add.button}">Title</title>
-</head>
-<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
-
-<div th:fragment="mytwtitle">
-    <h1>
-        <i class="fas fa-edit"></i>
-        <span th:utext="#{user.selfservice.contexts.add.button}">Add Area</span>
-        <small>
-            <span th:utext="#{user.selfservice.forUser}">for User:</span>
-            <strong>
-                <span sec:authentication="name"></span>
-            </strong>
-        </small>
-    </h1>
-</div>
-
-<div th:fragment="mytwcontent">
-    <div>
-        <form id="formId" th:action="@{/user/selfservice/context/add}" th:object="${newContext}" method="post">
-            <td>
-                <div class="form-group">
-                    <label th:for="${#ids.next('nameEn')}" class="control-label">
-                        <span th:utext="#{enum.language.en}">Englisch</span>
-                    </label>
-                    <input type="text" th:field="*{nameEn}" class="form-control" />
-                    <div>
-                        <div th:each="err : ${#fields.errors('nameEn')}" th:text="${err}" class="alert alert-danger" />
-                    </div>
-                </div>
-            </td>
-            <td>
-                <div class="form-group">
-                    <label th:for="${#ids.next('nameDe')}" class="control-label">
-                        <span th:utext="#{enum.language.de}">Deutsch</span>
-                    </label>
-                    <input type="text" th:field="*{nameDe}" class="form-control" />
-                    <div>
-                        <div th:each="err : ${#fields.errors('nameDe')}" th:text="${err}" class="alert alert-danger" />
-                    </div>
-                </div>
-            </td>
-            <td>
-                <button id="createNewProject" type="submit" class="btn btn-primary">
-                    <i class="fas fa-save"></i>
-                    <span th:utext="#{user.selfservice.contexts.add.button}">Add Area</span>
-                </button>
-            </td>
-            <td>&nbsp;</td>
-        </form>
-    </div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
+<!DOCTYPE html>
+<html th:lang="${#locale.language}"
+      xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
+      xmlns:sd="http://www.thymeleaf.org/spring-data">
+<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
+    <title th:text="'SimpleWorklist | ' + #{user.selfservice.contexts.add.button}">Title</title>
+</head>
+<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
+
+<div th:fragment="mytwtitle">
+    <h1>
+        <i class="fas fa-edit"></i>
+        <span th:utext="#{user.selfservice.contexts.add.button}">Add Area</span>
+        <small>
+            <span th:utext="#{user.selfservice.forUser}">for User:</span>
+            <strong>
+                <span sec:authentication="name"></span>
+            </strong>
+        </small>
+    </h1>
+</div>
+
+<div th:fragment="mytwcontent">
+    <div>
+        <form id="formId" th:action="@{/user/selfservice/context/add}" th:object="${newContext}" method="post">
+            <td>
+                <div class="form-group form-control-lg">
+                    <label th:for="${#ids.next('nameEn')}" class="control-label">
+                        <span th:utext="#{enum.language.en}">Englisch</span>
+                    </label>
+                    <input type="text" th:field="*{nameEn}" class="form-control" />
+                    <div>
+                        <div th:each="err : ${#fields.errors('nameEn')}" th:text="${err}" class="alert alert-danger" />
+                    </div>
+                </div>
+            </td>
+            <td>
+                <div class="form-group form-control-lg">
+                    <label th:for="${#ids.next('nameDe')}" class="control-label">
+                        <span th:utext="#{enum.language.de}">Deutsch</span>
+                    </label>
+                    <input type="text" th:field="*{nameDe}" class="form-control" />
+                    <div>
+                        <div th:each="err : ${#fields.errors('nameDe')}" th:text="${err}" class="alert alert-danger" />
+                    </div>
+                </div>
+            </td>
+            <td>
+                <button id="createNewProject" type="submit" class="btn btn-primary">
+                    <i class="fas fa-save"></i>
+                    <span th:utext="#{user.selfservice.contexts.add.button}">Add Area</span>
+                </button>
+            </td>
+            <td>&nbsp;</td>
+        </form>
+    </div>
+</div>
+
+</body>
+</html>
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 @@
-<!DOCTYPE html>
-<html th:lang="${#locale.language}"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:th="http://www.thymeleaf.org"
-      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
-      xmlns:sd="http://www.thymeleaf.org/spring-data">
-<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
-    <title th:text="'SimpleWorklist | ' + #{user.selfservice.profile.changeContexts}">Title</title>
-</head>
-<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
-
-    <div th:fragment="mytwtitle">
-        <h1>
-            <i class="fas fa-edit"></i>
-            <span th:utext="#{user.selfservice.profile.changeContexts}">Change Areas</span>
-              <small>
-                    <span th:utext="#{user.selfservice.forUser}">for User:</span>
-                    <strong>
-                        <span sec:authentication="name"></span>
-                    </strong>
-              </small>
-        </h1>
-    </div>
-
-    <div th:fragment="mytwcontent">
-        <div>
-            <a th:href="@{/user/selfservice/context/add}" class="btn btn-primary" role="button">
-                <i class="fas fa-plus-square"></i>
-                <span th:utext="#{user.selfservice.contexts.add.button}">Add Area</span>
-            </a>
-            <br />
-            <table class="table table-striped table-hover">
-                <thead>
-                <tr>
-                    <th>
-                        <span th:utext="#{enum.language.en}">Englisch</span>
-                    </th>
-                    <th>
-                        <span th:utext="#{enum.language.de}">Deutsch</span>
-                    </th>
-                    <th>&nbsp;</th>
-                    <th>&nbsp;</th>
-                </tr>
-                </thead>
-                <tbody>
-                    <tr th:each="context : ${contexts}">
-                        <td>
-                            <span th:text="${context.nameEn}">context.nameEn</span>
-                        </td>
-                        <td>
-                            <span th:text="${context.nameDe}">context.nameDe</span>
-                        </td>
-                        <td>
-                            <a th:href="@{/user/selfservice/context/edit/{id}(id=${context.id})}">
-                                <i class="fas fa-edit"></i>
-                            </a>
-                        </td>
-                        <td>
-                            <a th:href="@{/user/selfservice/context/delete/{id}(id=${context.id})}">
-                                <i class="fas fa-trash-alt"></i>
-                            </a>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-        </div>
-        <div class="card card-body">
-            <form id="formId" th:action="@{/user/selfservice/contexts}" th:object="${thisUser}" method="post">
-                <div class="form-group">
-                    <label th:for="${#ids.next('defaultContext.id')}"  class="control-label">
-                        <span th:utext="#{user.selfservice.context.default}">Default Area</span>
-                    </label>
-                    <select th:field="*{defaultContext.id}">
-                        <option th:each="context : ${contexts}"
-                                th:value="${context.id}"
-                                th:text="${locale == 'de' ? context.nameDe : context.nameEn}">Wireframe</option>
-                    </select>
-                    <div>
-                        <div th:each="err : ${#fields.errors('defaultContext.id')}" th:text="${err}" class="alert alert-danger" />
-                    </div>
-                </div>
-                <input type="hidden" th:field="*{id}" />
-                <button id="saveLanguageButton" type="submit" class="btn btn-primary">
-                    <i class="fas fa-save"></i>
-                    <span th:utext="#{user.selfservice.context.default.button}">Save Default Area</span>
-                </button>
-            </form>
-        </div>
-        <br/>
-        <a th:href="@{/user/selfservice/profile}">
-            <span th:utext="#{button.back}">back</span>
-        </a>
-
-    </div>
-
-</body>
-</html>
\ No newline at end of file
+<!DOCTYPE html>
+<html th:lang="${#locale.language}"
+      xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
+      xmlns:sd="http://www.thymeleaf.org/spring-data">
+<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
+    <title th:text="'SimpleWorklist | ' + #{user.selfservice.profile.changeContexts}">Title</title>
+</head>
+<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
+
+    <div th:fragment="mytwtitle">
+        <h1>
+            <i class="fas fa-edit"></i>
+            <span th:utext="#{user.selfservice.profile.changeContexts}">Change Areas</span>
+              <small>
+                    <span th:utext="#{user.selfservice.forUser}">for User:</span>
+                    <strong>
+                        <span sec:authentication="name"></span>
+                    </strong>
+              </small>
+        </h1>
+    </div>
+
+    <div th:fragment="mytwcontent">
+        <div>
+            <a th:href="@{/user/selfservice/context/add}" class="btn btn-primary" role="button">
+                <i class="fas fa-plus-square"></i>
+                <span th:utext="#{user.selfservice.contexts.add.button}">Add Area</span>
+            </a>
+            <br />
+            <table class="table table-striped table-hover">
+                <thead>
+                <tr>
+                    <th>
+                        <span th:utext="#{enum.language.en}">Englisch</span>
+                    </th>
+                    <th>
+                        <span th:utext="#{enum.language.de}">Deutsch</span>
+                    </th>
+                    <th>&nbsp;</th>
+                    <th>&nbsp;</th>
+                </tr>
+                </thead>
+                <tbody>
+                    <tr th:each="context : ${contexts}">
+                        <td>
+                            <span th:text="${context.nameEn}">context.nameEn</span>
+                        </td>
+                        <td>
+                            <span th:text="${context.nameDe}">context.nameDe</span>
+                        </td>
+                        <td>
+                            <a th:href="@{/user/selfservice/context/edit/{id}(id=${context.id})}">
+                                <i class="fas fa-edit"></i>
+                            </a>
+                        </td>
+                        <td>
+                            <a th:href="@{/user/selfservice/context/delete/{id}(id=${context.id})}">
+                                <i class="fas fa-trash-alt"></i>
+                            </a>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+        <div class="card card-body">
+            <form id="formId" th:action="@{/user/selfservice/contexts}" th:object="${thisUser}" method="post">
+                <div class="form-group form-control-lg">
+                    <label th:for="${#ids.next('defaultContext.id')}"  class="control-label">
+                        <span th:utext="#{user.selfservice.context.default}">Default Area</span>
+                    </label>
+                    <select th:field="*{defaultContext.id}">
+                        <option th:each="context : ${contexts}"
+                                th:value="${context.id}"
+                                th:text="${locale == 'de' ? context.nameDe : context.nameEn}">Wireframe</option>
+                    </select>
+                    <div>
+                        <div th:each="err : ${#fields.errors('defaultContext.id')}" th:text="${err}" class="alert alert-danger" />
+                    </div>
+                </div>
+                <input type="hidden" th:field="*{id}" />
+                <button id="saveLanguageButton" type="submit" class="btn btn-primary">
+                    <i class="fas fa-save"></i>
+                    <span th:utext="#{user.selfservice.context.default.button}">Save Default Area</span>
+                </button>
+            </form>
+        </div>
+        <br/>
+        <a th:href="@{/user/selfservice/profile}">
+            <span th:utext="#{button.back}">back</span>
+        </a>
+
+    </div>
+
+</body>
+</html>
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 @@
-<!DOCTYPE html>
-<html th:lang="${#locale.language}"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:th="http://www.thymeleaf.org"
-      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
-      xmlns:sd="http://www.thymeleaf.org/spring-data">
-<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
-    <title th:text="'SimpleWorklist | ' + #{user.selfservice.contexts.edit}">Title</title>
-</head>
-<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
-
-    <div th:fragment="mytwtitle">
-        <h1>
-            <i class="fas fa-edit"></i>
-            <span th:utext="#{user.selfservice.contexts.edit}">Edit Area</span>
-            <small>
-            <span th:utext="#{user.selfservice.forUser}">for User:</span>
-            <strong>
-                <span sec:authentication="name"></span>
-            </strong>
-            </small>
-        </h1>
-    </div>
-
-    <div th:fragment="mytwcontent">
-        <div>
-            <form id="formId" th:action="@{/user/selfservice/context/edit/{id}(id=${contextId})}" th:object="${editContext}" method="post">
-                <td>
-                    <div class="form-group">
-                        <label th:for="${#ids.next('nameEn')}" class="control-label">
-                            <span th:utext="#{enum.language.en}">Englisch</span>
-                        </label>
-                        <input type="text" th:field="*{nameEn}" class="form-control" />
-                        <div>
-                            <div th:each="err : ${#fields.errors('nameEn')}" th:text="${err}" class="alert alert-danger" />
-                        </div>
-                    </div>
-                </td>
-                <td>
-                    <div class="form-group">
-                        <label th:for="${#ids.next('nameDe')}" class="control-label">
-                            <span th:utext="#{enum.language.de}">Deutsch</span>
-                        </label>
-                        <input type="text" th:field="*{nameDe}" class="form-control" />
-                        <div>
-                            <div th:each="err : ${#fields.errors('nameDe')}" th:text="${err}" class="alert alert-danger" />
-                        </div>
-                    </div>
-                </td>
-                <td>
-                    <button id="editContextButton" type="submit" class="btn btn-primary">
-                        <i class="fas fa-save"></i>
-                        <span th:utext="#{user.selfservice.contexts.edit.button}">Edit Area</span>
-                    </button>
-                </td>
-                <td>&nbsp;</td>
-            </form>
-        </div>
-    </div>
-
-</body>
-</html>
\ No newline at end of file
+<!DOCTYPE html>
+<html th:lang="${#locale.language}"
+      xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
+      xmlns:sd="http://www.thymeleaf.org/spring-data">
+<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
+    <title th:text="'SimpleWorklist | ' + #{user.selfservice.contexts.edit}">Title</title>
+</head>
+<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
+
+    <div th:fragment="mytwtitle">
+        <h1>
+            <i class="fas fa-edit"></i>
+            <span th:utext="#{user.selfservice.contexts.edit}">Edit Area</span>
+            <small>
+            <span th:utext="#{user.selfservice.forUser}">for User:</span>
+            <strong>
+                <span sec:authentication="name"></span>
+            </strong>
+            </small>
+        </h1>
+    </div>
+
+    <div th:fragment="mytwcontent">
+        <div>
+            <form id="formId" th:action="@{/user/selfservice/context/edit/{id}(id=${contextId})}" th:object="${editContext}" method="post">
+                <td>
+                    <div class="form-group form-control-lg">
+                        <label th:for="${#ids.next('nameEn')}" class="control-label">
+                            <span th:utext="#{enum.language.en}">Englisch</span>
+                        </label>
+                        <input type="text" th:field="*{nameEn}" class="form-control" />
+                        <div>
+                            <div th:each="err : ${#fields.errors('nameEn')}" th:text="${err}" class="alert alert-danger" />
+                        </div>
+                    </div>
+                </td>
+                <td>
+                    <div class="form-group form-control-lg">
+                        <label th:for="${#ids.next('nameDe')}" class="control-label">
+                            <span th:utext="#{enum.language.de}">Deutsch</span>
+                        </label>
+                        <input type="text" th:field="*{nameDe}" class="form-control" />
+                        <div>
+                            <div th:each="err : ${#fields.errors('nameDe')}" th:text="${err}" class="alert alert-danger" />
+                        </div>
+                    </div>
+                </td>
+                <td>
+                    <button id="editContextButton" type="submit" class="btn btn-primary">
+                        <i class="fas fa-save"></i>
+                        <span th:utext="#{user.selfservice.contexts.edit.button}">Edit Area</span>
+                    </button>
+                </td>
+                <td>&nbsp;</td>
+            </form>
+        </div>
+    </div>
+
+</body>
+</html>
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 @@
-<!DOCTYPE html>
-<html th:lang="${#locale.language}"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:th="http://www.thymeleaf.org"
-      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
-      xmlns:sd="http://www.thymeleaf.org/spring-data">
-<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
-    <title th:text="'SimpleWorklist | ' + #{user.selfservice.profile.changeLanguage}">Title</title>
-</head>
-<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
-
-    <div th:fragment="mytwtitle">
-        <h1>
-            <i class="fas fa-edit"></i>
-            <span th:utext="#{user.selfservice.profile.changeLanguage}">Set Default Language</span>
-            <span th:utext="#{user.selfservice.forUser}">for User:</span>
-            <small>
-            <strong>
-                <span sec:authentication="name"></span>
-            </strong>
-            </small>
-        </h1>
-    </div>
-
-    <div th:fragment="mytwcontent">
-        <form id="formId" th:action="@{/user/selfservice/language}" th:object="${userChangeLanguageForm}" method="post">
-            <div class="form-group">
-                <label th:for="${#ids.next('defaultLanguage')}" class="control-label">
-                    <span th:text="#{user.selfservice.language.defaultLanguage}">Language</span>
-                </label>
-                <select th:field="*{defaultLanguage}" class="form-control">
-                    <option th:each="language : ${languages}"
-                            th:value="${language.value}"
-                            th:text="${#messages.msg(language.code)}">language.code</option>
-                </select>
-                <div>
-                    <div th:each="err : ${#fields.errors('defaultLanguage')}" th:text="${err}" class="alert alert-danger">
-                    </div>
-                </div>
-            </div>
-            <button id="saveLanguageButton" type="submit" class="btn btn-primary">
-                <i class="fas fa-save"></i>
-                <span th:utext="#{user.selfservice.language.button}">Save Language</span>
-            </button>
-            <a th:href="@{/user/selfservice/profile}" class="btn btn-secondary" role="button">
-                <span th:utext="#{button.back}">back</span>
-            </a>
-        </form>
-    </div>
-
-</body>
-</html>
\ No newline at end of file
+<!DOCTYPE html>
+<html th:lang="${#locale.language}"
+      xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
+      xmlns:sd="http://www.thymeleaf.org/spring-data">
+<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
+    <title th:text="'SimpleWorklist | ' + #{user.selfservice.profile.changeLanguage}">Title</title>
+</head>
+<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
+
+    <div th:fragment="mytwtitle">
+        <h1>
+            <i class="fas fa-edit"></i>
+            <span th:utext="#{user.selfservice.profile.changeLanguage}">Set Default Language</span>
+            <span th:utext="#{user.selfservice.forUser}">for User:</span>
+            <small>
+            <strong>
+                <span sec:authentication="name"></span>
+            </strong>
+            </small>
+        </h1>
+    </div>
+
+    <div th:fragment="mytwcontent">
+        <form id="formId" th:action="@{/user/selfservice/language}" th:object="${userChangeLanguageForm}" method="post">
+            <div class="form-group form-control-lg">
+                <label th:for="${#ids.next('defaultLanguage')}" class="control-label">
+                    <span th:text="#{user.selfservice.language.defaultLanguage}">Language</span>
+                </label>
+                <select th:field="*{defaultLanguage}" class="form-control">
+                    <option th:each="language : ${languages}"
+                            th:value="${language.value}"
+                            th:text="${#messages.msg(language.code)}">language.code</option>
+                </select>
+                <div>
+                    <div th:each="err : ${#fields.errors('defaultLanguage')}" th:text="${err}" class="alert alert-danger">
+                    </div>
+                </div>
+            </div>
+            <button id="saveLanguageButton" type="submit" class="btn btn-primary">
+                <i class="fas fa-save"></i>
+                <span th:utext="#{user.selfservice.language.button}">Save Language</span>
+            </button>
+            <a th:href="@{/user/selfservice/profile}" class="btn btn-secondary" role="button">
+                <span th:utext="#{button.back}">back</span>
+            </a>
+        </form>
+    </div>
+
+</body>
+</html>
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 @@
-<!DOCTYPE html>
-<html th:lang="${#locale.language}"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:th="http://www.thymeleaf.org"
-      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
-      xmlns:sd="http://www.thymeleaf.org/spring-data">
-<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
-    <title th:text="'SimpleWorklist | ' + #{user.selfservice.profile.name}">Title</title>
-</head>
-<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
-
-    <div th:fragment="mytwtitle">
-        <h1>
-            <i class="fas fa-edit"></i>
-            <span th:utext="#{user.selfservice.profile.name}">Change Name</span>
-            <span th:text="${thisUser.userFullname}">thisUser.userFullname</span>
-            <small>
-                <span th:utext="#{user.selfservice.forUser}">for User:</span>
-                <strong>
-                    <span sec:authentication="name"></span>
-                </strong>
-            </small>
-        </h1>
-    </div>
-
-    <div th:fragment="mytwcontent">
-        <div>
-            <form id="formId" th:action="@{/user/selfservice/name}" th:object="${username}" method="post">
-                <div class="form-group">
-                    <label th:for="${#ids.next('userFullname')}" class="control-label">
-                        <span th:utext="#{user.registerConfirmed.userFullname}">Full Name</span>
-                    </label>
-                    <input type="text" th:field="*{userFullname}" class="form-control" />
-                    <div>
-                        <div th:each="err : ${#fields.errors('userFullname')}" th:text="${err}" class="alert alert-danger">
-                        </div>
-                    </div>
-                </div>
-                <button id="save-username" type="submit" class="btn btn-primary">
-                    <i class="fas fa-save"></i>
-                    <span th:utext="#{user.selfservice.name.button}">Save Username</span>
-                </button>
-                <a th:href="@{/user/selfservice/profile}" class="btn btn-secondary" role="button">
-                    <span th:utext="#{button.back}">back</span>
-                </a>
-            </form>
-        </div>
-    </div>
-
-</body>
-</html>
\ No newline at end of file
+<!DOCTYPE html>
+<html th:lang="${#locale.language}"
+      xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
+      xmlns:sd="http://www.thymeleaf.org/spring-data">
+<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
+    <title th:text="'SimpleWorklist | ' + #{user.selfservice.profile.name}">Title</title>
+</head>
+<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
+
+    <div th:fragment="mytwtitle">
+        <h1>
+            <i class="fas fa-edit"></i>
+            <span th:utext="#{user.selfservice.profile.name}">Change Name</span>
+            <span th:text="${thisUser.userFullname}">thisUser.userFullname</span>
+            <small>
+                <span th:utext="#{user.selfservice.forUser}">for User:</span>
+                <strong>
+                    <span sec:authentication="name"></span>
+                </strong>
+            </small>
+        </h1>
+    </div>
+
+    <div th:fragment="mytwcontent">
+        <div>
+            <form id="formId" th:action="@{/user/selfservice/name}" th:object="${username}" method="post">
+                <div class="form-group form-control-lg">
+                    <label th:for="${#ids.next('userFullname')}" class="control-label">
+                        <span th:utext="#{user.registerConfirmed.userFullname}">Full Name</span>
+                    </label>
+                    <input type="text" th:field="*{userFullname}" class="form-control" />
+                    <div>
+                        <div th:each="err : ${#fields.errors('userFullname')}" th:text="${err}" class="alert alert-danger">
+                        </div>
+                    </div>
+                </div>
+                <button id="save-username" type="submit" class="btn btn-primary">
+                    <i class="fas fa-save"></i>
+                    <span th:utext="#{user.selfservice.name.button}">Save Username</span>
+                </button>
+                <a th:href="@{/user/selfservice/profile}" class="btn btn-secondary" role="button">
+                    <span th:utext="#{button.back}">back</span>
+                </a>
+            </form>
+        </div>
+    </div>
+
+</body>
+</html>
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 @@
-<!DOCTYPE html>
-<html th:lang="${#locale.language}"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:th="http://www.thymeleaf.org"
-      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
-      xmlns:sd="http://www.thymeleaf.org/spring-data">
-<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
-    <title th:text="'SimpleWorklist | ' + #{user.selfservice.profile.changePassword}">Title</title>
-</head>
-<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
-
-    <div th:fragment="mytwtitle">
-        <h1>
-            <i class="fas fa-edit"></i>
-            <span th:utext="#{user.selfservice.profile.changePassword}">Change Password</span>
-            <small>
-                <span th:utext="#{user.selfservice.forUser}">for User:</span>
-                <strong>
-                    <span sec:authentication="name"></span>
-                </strong>
-            </small>
-        </h1>
-    </div>
-
-    <div th:fragment="mytwcontent">
-        <div>
-            <form id="formId" th:action="@{/user/selfservice/password}" th:object="${userChangePasswordForm}" method="post">
-                <div class="form-group">
-                    <label th:for="${#ids.next('oldUserPassword')}" class="control-label">
-                        <span th:utext="#{user.resetPasswordConfirmed.oldUserPassword}">Current Password</span>
-                    </label>
-                    <input type="password" th:field="*{oldUserPassword}" class="form-control" />
-                    <div>
-                        <div th:each="err : ${#fields.errors('oldUserPassword')}" th:text="${err}" class="alert alert-danger" />
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label th:for="${#ids.next('userPassword')}" class="control-label">
-                        <span th:utext="#{user.resetPasswordConfirmed.password}">Password</span>
-                    </label>
-                    <input type="password" th:field="*{userPassword}" class="form-control" />
-                    <div>
-                        <div th:each="err : ${#fields.errors('userPassword')}" th:text="${err}" class="alert alert-danger" />
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label th:for="${#ids.next('userPasswordConfirmation')}" class="control-label">
-                        <span th:utext="#{user.resetPasswordConfirmed.passwordAgain}">Password again</span>
-                    </label>
-                    <input type="password" th:field="*{userPasswordConfirmation}" class="form-control" />
-                    <div>
-                        <div th:each="err : ${#fields.errors('userPasswordConfirmation')}" th:text="${err}" class="alert alert-danger" />
-                    </div>
-                </div>
-                <button id="saveNewPassword" type="submit" class="btn btn-primary">
-                    <i class="fas fa-save"></i>
-                    <span th:utext="#{user.resetPasswordConfirmed.button}">Save New Password</span>
-                </button>
-                <a th:href="@{/user/selfservice/profile}" class="btn btn-secondary" role="button">
-                    <span th:utext="#{button.back}">back</span>
-                </a>
-            </form>
-        </div>
-    </div>
-
-</body>
-</html>
\ No newline at end of file
+<!DOCTYPE html>
+<html th:lang="${#locale.language}"
+      xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
+      xmlns:sd="http://www.thymeleaf.org/spring-data">
+<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
+    <title th:text="'SimpleWorklist | ' + #{user.selfservice.profile.changePassword}">Title</title>
+</head>
+<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{})">
+
+    <div th:fragment="mytwtitle">
+        <h1>
+            <i class="fas fa-edit"></i>
+            <span th:utext="#{user.selfservice.profile.changePassword}">Change Password</span>
+            <small>
+                <span th:utext="#{user.selfservice.forUser}">for User:</span>
+                <strong>
+                    <span sec:authentication="name"></span>
+                </strong>
+            </small>
+        </h1>
+    </div>
+
+    <div th:fragment="mytwcontent">
+        <div>
+            <form id="formId" th:action="@{/user/selfservice/password}" th:object="${userChangePasswordForm}" method="post">
+                <div class="form-group form-control-lg">
+                    <label th:for="${#ids.next('oldUserPassword')}" class="control-label">
+                        <span th:utext="#{user.resetPasswordConfirmed.oldUserPassword}">Current Password</span>
+                    </label>
+                    <input type="password" th:field="*{oldUserPassword}" class="form-control" />
+                    <div>
+                        <div th:each="err : ${#fields.errors('oldUserPassword')}" th:text="${err}" class="alert alert-danger" />
+                    </div>
+                </div>
+                <div class="form-group form-control-lg">
+                    <label th:for="${#ids.next('userPassword')}" class="control-label">
+                        <span th:utext="#{user.resetPasswordConfirmed.password}">Password</span>
+                    </label>
+                    <input type="password" th:field="*{userPassword}" class="form-control" />
+                    <div>
+                        <div th:each="err : ${#fields.errors('userPassword')}" th:text="${err}" class="alert alert-danger" />
+                    </div>
+                </div>
+                <div class="form-group form-control-lg">
+                    <label th:for="${#ids.next('userPasswordConfirmation')}" class="control-label">
+                        <span th:utext="#{user.resetPasswordConfirmed.passwordAgain}">Password again</span>
+                    </label>
+                    <input type="password" th:field="*{userPasswordConfirmation}" class="form-control" />
+                    <div>
+                        <div th:each="err : ${#fields.errors('userPasswordConfirmation')}" th:text="${err}" class="alert alert-danger" />
+                    </div>
+                </div>
+                <button id="saveNewPassword" type="submit" class="btn btn-primary">
+                    <i class="fas fa-save"></i>
+                    <span th:utext="#{user.resetPasswordConfirmed.button}">Save New Password</span>
+                </button>
+                <a th:href="@{/user/selfservice/profile}" class="btn btn-secondary" role="button">
+                    <span th:utext="#{button.back}">back</span>
+                </a>
+            </form>
+        </div>
+    </div>
+
+</body>
+</html>

From da9280da52da5b869ae2943d95e36df9b2718c4d Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 13:42:00 +0200
Subject: [PATCH 15/47] work in progress

---
 .../resources/templates/layout/taskedit.html  | 112 ++++++++++++++++++
 .../templates/project/id/task/edit.html       | 103 +---------------
 .../templates/project/root/task/edit.html     | 103 +---------------
 .../templates/taskstate/task/edit.html        |  99 +---------------
 4 files changed, 115 insertions(+), 302 deletions(-)
 create mode 100644 src/main/resources/templates/layout/taskedit.html

diff --git a/src/main/resources/templates/layout/taskedit.html b/src/main/resources/templates/layout/taskedit.html
new file mode 100644
index 00000000..6fd06f29
--- /dev/null
+++ b/src/main/resources/templates/layout/taskedit.html
@@ -0,0 +1,112 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
+      xmlns:sd="http://www.thymeleaf.org/spring-data">
+
+    <div th:fragment="tw-task-edit-form(task,listTaskState,listTaskEnergy,listTaskTime,contexts)">
+        <input type="hidden" th:field="*{id}" />
+        <input type="hidden" th:field="*{uuid}" />
+        <input type="hidden" th:field="*{focus}" />
+        <input type="hidden" th:field="*{rowCreatedAt.time}" />
+        <div class="form-group form-control-lg">
+            <div th:each="err : ${#fields.errors('title')}">
+                <div class="alert alert-danger" th:text="${err}" >err</div>
+            </div>
+            <label th:for="${#ids.next('title')}" class="control-label">
+                <span th:utext="#{task.show.title}">Title</span>
+            </label>
+            <input type="text" th:field="*{title}" class="form-control" />
+        </div>
+        <span class="form-group form-control-lg">
+            <div th:each="err : ${#fields.errors('taskState')}">
+                <div class="alert alert-danger" th:text="${err}" >err</div>
+            </div>
+            <label th:for="${#ids.next('listTaskState')}" class="control-label">
+                <span th:utext="#{tasks.col.taskState}">taskState</span>
+            </label>
+            <select th:field="*{taskState}">
+                <option th:each="taskStateItem : ${listTaskState}"
+                        th:value="${taskStateItem.value}"
+                        th:text="${#messages.msgOrNull(taskStateItem.code)}">
+                    taskStateItem
+                </option>
+            </select>
+        </span>
+        <div class="form-group form-control-lg">
+            <div th:each="err : ${#fields.errors('dueDate')}">
+                <div class="alert alert-danger" th:text="${err}" >err</div>
+            </div>
+            <label for="taskDueDate" class="control-label">
+                <span th:utext="#{task.show.dueDate}">dueDate</span>
+            </label>
+            <input id="taskDueDate" type="text" th:field="*{dueDate}" class="form-control" />
+        </div>
+        <div class="form-group form-control-lg">
+            <div th:each="err : ${#fields.errors('text')}">
+                <div class="alert alert-danger" th:text="${err}" >err</div>
+            </div>
+            <label th:for="textEditor" class="control-label">
+                <span th:utext="#{task.show.text}">Text</span>
+            </label>
+            <textarea id="textEditor" name="textEditor" rows="10" cols="50" class="form-control"
+                      th:field="*{text}">Text
+            </textarea>
+        </div>
+        <div>
+            <span class="form-group form-control-lg">
+                <div th:each="err : ${#fields.errors('taskEnergy')}">
+                    <div class="alert alert-danger" th:text="${err}" >err</div>
+                </div>
+                <label th:for="${#ids.next('taskEnergy')}" class="control-label">
+                    <span th:utext="#{task.show.taskEnergy}">taskEnergy</span>
+                </label>
+                <select th:field="*{taskEnergy}">
+                    <option th:each="taskEnergyItem : ${listTaskEnergy}"
+                            th:value="${taskEnergyItem.value}"
+                            th:text="${#messages.msgOrNull(taskEnergyItem.code)}">
+                        taskEnergyItem
+                    </option>
+                </select>
+            </span>&nbsp;
+            <span class="form-group form-control-lg">
+                <div th:each="err : ${#fields.errors('taskEnergy')}">
+                    <div class="alert alert-danger" th:text="${err}" >err</div>
+                </div>
+                <label th:for="${#ids.next('taskTime')}" class="control-label">
+                    <span th:utext="#{task.show.taskTime}">Time</span>
+                </label>
+                <select th:field="*{taskTime}">
+                    <option th:each="taskTimeItem : ${listTaskTime}"
+                            th:value="${taskTimeItem.value}"
+                            th:text="${#messages.msgOrNull(taskTimeItem.code)}">
+                        taskTimeItem
+                    </option>
+                </select>
+            </span>&nbsp;
+            <span class="form-group form-control-lg">
+                <div th:each="err : ${#fields.errors('context.id')}">
+                    <div class="alert alert-danger" th:text="${err}" >err</div>
+                </div>
+                <label th:for="${#ids.next('context.id')}" class="control-label">
+                    <span th:utext="#{task.show.context}">Area</span>
+                </label>
+                <select th:field="*{context.id}">
+                    <option th:each="contextOption : ${contexts}"
+                            th:value="${contextOption.id}"
+                            th:text="${locale == 'de' ? contextOption.nameDe : contextOption.nameEn}">
+                        contextOption
+                    </option>
+                </select>
+            </span>
+        </div>
+        <input type="hidden"
+               name="${_csrf.parameterName}"
+               value="${_csrf.token}"/>
+        <button id="editDataLeaf" type="submit" class="btn btn-primary">
+            <i class="fas fa-save"></i>
+            <span th:utext="#{task.show.button}">Save Task</span>
+        </button>
+    </div>
+
+</html>
diff --git a/src/main/resources/templates/project/id/task/edit.html b/src/main/resources/templates/project/id/task/edit.html
index 35ff8db8..3c74f819 100644
--- a/src/main/resources/templates/project/id/task/edit.html
+++ b/src/main/resources/templates/project/id/task/edit.html
@@ -21,108 +21,7 @@ <h1>
 	<div>
 		<form id="formId" th:object="${task}" method="post"
               th:action="@{/project/{projectId}/task/{taskId}/edit(taskId=${task.id},projectId=${thisProject.id})}" >
-			<input type="hidden" th:field="*{id}" />
-            <input type="hidden" th:field="*{uuid}" />
-            <input type="hidden" th:field="*{focus}" />
-			<input type="hidden" th:field="*{rowCreatedAt.time}" />
-			<div class="form-group form-control-lg">
-                <div th:each="err : ${#fields.errors('title')}">
-                    <div class="alert alert-danger" th:text="${err}" >err</div>
-                </div>
-				<label th:for="${#ids.next('title')}" class="control-label">
-					<span th:utext="#{task.show.title}">Title</span>
-				</label>
-				<input type="text" th:field="*{title}" class="form-control" />
-			</div>
-            <span class="form-group form-control-lg">
-                <div th:each="err : ${#fields.errors('taskState')}">
-                    <div class="alert alert-danger" th:text="${err}" >err</div>
-                </div>
-                <label th:for="${#ids.next('listTaskState')}" class="control-label">
-                    <span th:utext="#{tasks.col.taskState}">taskState</span>
-                </label>
-                <select th:field="*{taskState}">
-                    <option th:each="taskStateItem : ${listTaskState}"
-                            th:value="${taskStateItem.value}"
-                            th:text="${#messages.msgOrNull(taskStateItem.code)}">
-                        taskStateItem
-                    </option>
-                </select>
-            </span>
-			<div class="form-group form-control-lg">
-                <div th:each="err : ${#fields.errors('dueDate')}">
-                    <div class="alert alert-danger" th:text="${err}" >err</div>
-                </div>
-				<label for="taskDueDate" class="control-label">
-					<span th:utext="#{task.show.dueDate}">dueDate</span>
-				</label>
-				<input id="taskDueDate" type="text" th:field="*{dueDate}" class="form-control" />
-			</div>
-			<div class="form-group form-control-lg">
-                <div th:each="err : ${#fields.errors('text')}">
-                    <div class="alert alert-danger" th:text="${err}" >err</div>
-                </div>
-				<label th:for="textEditor" class="control-label">
-					<span th:utext="#{task.show.text}">Text</span>
-				</label>
-				<textarea id="textEditor" name="textEditor" rows="10" cols="50" class="form-control"
-                          th:field="*{text}">Text
-                </textarea>
-			</div>
-			<div>
-				<span class="form-group form-control-lg">
-                    <div th:each="err : ${#fields.errors('taskEnergy')}">
-                        <div class="alert alert-danger" th:text="${err}" >err</div>
-                    </div>
-					<label th:for="${#ids.next('taskEnergy')}" class="control-label">
-						<span th:utext="#{task.show.taskEnergy}">taskEnergy</span>
-					</label>
-					<select th:field="*{taskEnergy}">
-						<option th:each="taskEnergyItem : ${listTaskEnergy}"
-								th:value="${taskEnergyItem.value}"
-								th:text="${#messages.msgOrNull(taskEnergyItem.code)}">
-                            taskEnergyItem
-                        </option>
-					</select>
-				</span>&nbsp;
-				<span class="form-group form-control-lg">
-                    <div th:each="err : ${#fields.errors('taskEnergy')}">
-                        <div class="alert alert-danger" th:text="${err}" >err</div>
-                    </div>
-					<label th:for="${#ids.next('taskTime')}" class="control-label">
-						<span th:utext="#{task.show.taskTime}">Time</span>
-					</label>
-					<select th:field="*{taskTime}">
-						<option th:each="taskTimeItem : ${listTaskTime}"
-								th:value="${taskTimeItem.value}"
-								th:text="${#messages.msgOrNull(taskTimeItem.code)}">
-                            taskTimeItem
-                        </option>
-					</select>
-				</span>&nbsp;
-				<span class="form-group form-control-lg">
-                    <div th:each="err : ${#fields.errors('context.id')}">
-                        <div class="alert alert-danger" th:text="${err}" >err</div>
-                    </div>
-					<label th:for="${#ids.next('context.id')}" class="control-label">
-						<span th:utext="#{task.show.context}">Area</span>
-					</label>
-					<select th:field="*{context.id}">
-						<option th:each="contextOption : ${contexts}"
-								th:value="${contextOption.id}"
-								th:text="${locale == 'de' ? contextOption.nameDe : contextOption.nameEn}">
-                            contextOption
-                        </option>
-					</select>
-				</span>
-			</div>
-            <input type="hidden"
-                   name="${_csrf.parameterName}"
-                   value="${_csrf.token}"/>
-			<button id="editDataLeaf" type="submit" class="btn btn-primary">
-				<i class="fas fa-save"></i>
-				<span th:utext="#{task.show.button}">Save Task</span>
-			</button>
+            <div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
 			<a class="btn btn-secondary" role="button"
                th:href="@{/project/{projectId}/task/{id}/transform(id=${task.id},projectId=${thisProject.id})}">
 				<i class="fas fa-project-diagram"></i>
diff --git a/src/main/resources/templates/project/root/task/edit.html b/src/main/resources/templates/project/root/task/edit.html
index 62c8cf10..4c5a99cf 100644
--- a/src/main/resources/templates/project/root/task/edit.html
+++ b/src/main/resources/templates/project/root/task/edit.html
@@ -21,108 +21,7 @@ <h1>
 	<div>
 		<form id="formId" method="post"
               th:action="@{/project/root/task/{taskId}/edit(taskId=${task.id})}" th:object="${task}">
-			<input type="hidden" th:field="*{id}" />
-            <input type="hidden" th:field="*{uuid}" />
-			<input type="hidden" th:field="*{rowCreatedAt.time}" />
-			<div class="form-group form-control-lg">
-                <div th:each="err : ${#fields.errors('title')}">
-                    <div class="alert alert-danger" th:text="${err}" >err</div>
-                </div>
-				<label th:for="${#ids.next('title')}" class="control-label">
-					<span th:utext="#{task.show.title}">Title</span>
-				</label>
-				<input type="text" th:field="*{title}" class="form-control" />
-			</div>
-            <span class="form-group form-control-lg">
-                <div th:each="err : ${#fields.errors('taskState')}">
-                    <div class="alert alert-danger" th:text="${err}" >err</div>
-                </div>
-                <label th:for="${#ids.next('listTaskState')}" class="control-label">
-                    <span th:utext="#{tasks.col.taskState}">taskState</span>
-                </label>
-                <select th:field="*{taskState}">
-                    <option th:each="taskStateItem : ${listTaskState}"
-                            th:value="${taskStateItem.value}"
-                            th:text="${#messages.msgOrNull(taskStateItem.code)}">
-                        taskStateItem.code
-                    </option>
-                </select>
-            </span>
-			<div class="form-group form-control-lg">
-                <div th:each="err : ${#fields.errors('dueDate')}">
-                    <div class="alert alert-danger" th:text="${err}" >err</div>
-                </div>
-				<label for="taskDueDate" class="control-label">
-					<span th:utext="#{task.show.dueDate}">dueDate</span>
-				</label>
-				<input id="taskDueDate" type="text" th:field="*{dueDate}" class="form-control" />
-			</div>
-			<div class="form-group form-control-lg">
-                <div th:each="err : ${#fields.errors('text')}">
-                    <div class="alert alert-danger" th:text="${err}" >err</div>
-                </div>
-				<label th:for="textEditor" class="control-label">
-					<span th:utext="#{task.show.text}">Text</span>
-				</label>
-				<textarea id="textEditor" name="textEditor" rows="10" cols="50" class="form-control"
-                          th:field="*{text}">
-                    Text
-                </textarea>
-			</div>
-			<div>
-				<span class="form-group form-control-lg">
-                    <div th:each="err : ${#fields.errors('taskEnergy')}">
-                        <div class="alert alert-danger" th:text="${err}" >err</div>
-                    </div>
-					<label th:for="${#ids.next('taskEnergy')}" class="control-label">
-						<span th:utext="#{task.show.taskEnergy}">taskEnergy</span>
-					</label>
-					<select th:field="*{taskEnergy}">
-						<option th:each="taskEnergyItem : ${listTaskEnergy}"
-								th:value="${taskEnergyItem.value}"
-								th:text="${#messages.msgOrNull(taskEnergyItem.code)}">
-                            taskEnergyItem.code
-                        </option>
-					</select>
-				</span>&nbsp;
-				<span class="form-group form-control-lg">
-                    <div th:each="err : ${#fields.errors('taskEnergy')}">
-                        <div class="alert alert-danger" th:text="${err}" >err</div>
-                    </div>
-					<label th:for="${#ids.next('taskTime')}" class="control-label">
-						<span th:utext="#{task.show.taskTime}">taskTime</span>
-					</label>
-					<select th:field="*{taskTime}">
-						<option th:each="taskTimeItem : ${listTaskTime}"
-								th:value="${taskTimeItem.value}"
-								th:text="${#messages.msgOrNull(taskTimeItem.code)}">
-                            taskTimeItem.code
-                        </option>
-					</select>
-				</span>&nbsp;
-				<span class="form-group form-control-lg">
-                    <div th:each="err : ${#fields.errors('context.id')}">
-                        <div class="alert alert-danger" th:text="${err}" >err</div>
-                    </div>
-					<label th:for="${#ids.next('context.id')}" class="control-label">
-						<span th:utext="#{task.show.context}">context</span>
-					</label>
-					<select th:field="*{context.id}">
-						<option th:each="contextOption : ${contexts}"
-								th:value="${contextOption.id}"
-								th:text="${locale == 'de' ? contextOption.nameDe : contextOption.nameEn}">
-                            contextOption
-                        </option>
-					</select>
-				</span>
-			</div>
-            <input type="hidden"
-                   name="${_csrf.parameterName}"
-                   value="${_csrf.token}"/>
-			<button id="editDataLeaf" type="submit" class="btn btn-primary">
-				<i class="fas fa-save"></i>
-				<span th:utext="#{task.show.button}">Save Task</span>
-			</button>
+            <div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
 			<a th:href="@{/task/{id}/transform(id=${task.id})}" class="btn btn-secondary" role="button">
 				<i class="fas fa-project-diagram"></i>
 				<span th:utext="#{task.show.transform}">Transform into Project</span>
diff --git a/src/main/resources/templates/taskstate/task/edit.html b/src/main/resources/templates/taskstate/task/edit.html
index d9d3e448..0d04a747 100644
--- a/src/main/resources/templates/taskstate/task/edit.html
+++ b/src/main/resources/templates/taskstate/task/edit.html
@@ -20,104 +20,7 @@ <h1>
 <div th:fragment="mytwcontent">
 	<div>
 		<form id="formId" th:action="@{/taskstate/task/{taskId}/edit(taskId=${task.id})}" th:object="${task}" method="post">
-			<input type="hidden" th:field="*{id}" />
-            <input type="hidden" th:field="*{uuid}" />
-			<input type="hidden" th:field="*{rowCreatedAt.time}" />
-			<div class="form-group form-control-lg">
-				<label th:for="${#ids.next('title')}" class="control-label">
-					<span th:utext="#{task.show.title}">Title</span>
-				</label>
-				<input type="text" th:field="*{title}" class="form-control" />
-				<div>
-					<div th:each="err : ${#fields.errors('title')}" th:text="${err}" class="alert alert-danger" >
-					</div>
-				</div>
-			</div>
-            <span class="form-group form-control-lg">
-                <label th:for="${#ids.next('listTaskState')}" class="control-label">
-                    <span th:utext="#{tasks.col.taskState}">taskState</span>
-                </label>
-                <select th:field="*{taskState}">
-                    <option th:each="taskStateItem : ${listTaskState}"
-                            th:value="${taskStateItem.value}"
-                            th:text="${#messages.msgOrNull(taskStateItem.code)}">taskStateItemCode</option>
-                </select>
-                <div>
-                    <div th:each="err : ${#fields.errors('taskState')}" th:text="${err}" class="alert alert-danger">
-                    </div>
-                </div>
-            </span>
-			<div class="form-group form-control-lg">
-				<label for="taskDueDate" class="control-label">
-					<span th:utext="#{task.show.dueDate}">Due Date</span>
-				</label>
-				<input id="taskDueDate" type="text" th:field="*{dueDate}" class="form-control" />
-				<div>
-					<div th:each="err : ${#fields.errors('dueDate')}" th:text="${err}" class="alert alert-danger">
-					</div>
-				</div>
-			</div>
-			<div class="form-group form-control-lg">
-				<label th:for="textEditor" class="control-label">
-					<span th:utext="#{task.show.text}">Text</span>
-				</label>
-				<textarea id="textEditor" name="textEditor" rows="10" cols="50" th:field="*{text}" class="form-control" ></textarea>
-				<div>
-					<div th:each="err : ${#fields.errors('text')}" th:text="${err}" class="alert alert-danger">
-					</div>
-				</div>
-			</div>
-			<div>
-				<span class="form-group form-control-lg">
-					<label th:for="${#ids.next('taskEnergy')}" class="control-label">
-						<span th:utext="#{task.show.taskEnergy}">Energy</span>
-					</label>
-					<select th:field="*{taskEnergy}">
-						<option th:each="taskEnergyItem : ${listTaskEnergy}"
-								th:value="${taskEnergyItem.value}"
-								th:text="${#messages.msgOrNull(taskEnergyItem.code)}">Wireframe</option>
-					</select>
-					<div>
-						<div th:each="err : ${#fields.errors('taskEnergy')}" th:text="${err}" class="alert alert-danger">
-						</div>
-					</div>
-				</span>&nbsp;
-				<span class="form-group form-control-lg">
-					<label th:for="${#ids.next('taskTime')}" class="control-label">
-						<span th:utext="#{task.show.taskTime}">Time</span>
-					</label>
-					<select th:field="*{taskTime}">
-						<option th:each="taskTimeItem : ${listTaskTime}"
-								th:value="${taskTimeItem.value}"
-								th:text="${#messages.msgOrNull(taskTimeItem.code)}">Wireframe</option>
-					</select>
-					<div>
-						<div th:each="err : ${#fields.errors('taskTime')}" th:text="${err}" class="alert alert-danger">
-						</div>
-					</div>
-				</span>&nbsp;
-				<span class="form-group form-control-lg">
-					<label th:for="${#ids.next('context.id')}" class="control-label">
-						<span th:utext="#{task.show.context}">Area</span>
-					</label>
-					<select th:field="*{context.id}">
-						<option th:each="areaOption : ${contexts}"
-								th:value="${areaOption.id}"
-								th:text="${locale == 'de' ? areaOption.nameDe : areaOption.nameEn}">Wireframe</option>
-					</select>
-					<div>
-						<div th:each="err : ${#fields.errors('context.id')}" th:text="${err}" class="alert alert-danger">
-						</div>
-					</div>
-				</span>
-			</div>
-            <input type="hidden"
-                   name="${_csrf.parameterName}"
-                   value="${_csrf.token}"/>
-			<button id="editDataLeaf" type="submit" class="btn btn-primary">
-				<i class="fas fa-save"></i>
-				<span th:utext="#{task.show.button}">Save Task</span>
-			</button>
+            <div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
 			<a th:href="@{/taskstate/task/{id}/transform(id=${task.id})}" class="btn btn-secondary" role="button">
 				<i class="fas fa-project-diagram"></i>
 				<span th:utext="#{task.show.transform}">Transform into Project</span>

From eea1fec8e68ff1ab518a2ff86d99560aff018f9b Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 13:50:07 +0200
Subject: [PATCH 16/47] work in progress

---
 .../resources/templates/layout/taskedit.html  | 43 +++++++++----------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/main/resources/templates/layout/taskedit.html b/src/main/resources/templates/layout/taskedit.html
index 6fd06f29..174c0c15 100644
--- a/src/main/resources/templates/layout/taskedit.html
+++ b/src/main/resources/templates/layout/taskedit.html
@@ -10,18 +10,15 @@
         <input type="hidden" th:field="*{focus}" />
         <input type="hidden" th:field="*{rowCreatedAt.time}" />
         <div class="form-group form-control-lg">
-            <div th:each="err : ${#fields.errors('title')}">
-                <div class="alert alert-danger" th:text="${err}" >err</div>
-            </div>
             <label th:for="${#ids.next('title')}" class="control-label">
                 <span th:utext="#{task.show.title}">Title</span>
             </label>
             <input type="text" th:field="*{title}" class="form-control" />
+            <div th:each="err : ${#fields.errors('title')}">
+                <div class="invalid-feedback" th:text="${err}" >err</div>
+            </div>
         </div>
         <span class="form-group form-control-lg">
-            <div th:each="err : ${#fields.errors('taskState')}">
-                <div class="alert alert-danger" th:text="${err}" >err</div>
-            </div>
             <label th:for="${#ids.next('listTaskState')}" class="control-label">
                 <span th:utext="#{tasks.col.taskState}">taskState</span>
             </label>
@@ -32,32 +29,31 @@
                     taskStateItem
                 </option>
             </select>
+            <div th:each="err : ${#fields.errors('taskState')}">
+                <div class="invalid-feedback" th:text="${err}" >err</div>
+            </div>
         </span>
         <div class="form-group form-control-lg">
-            <div th:each="err : ${#fields.errors('dueDate')}">
-                <div class="alert alert-danger" th:text="${err}" >err</div>
-            </div>
             <label for="taskDueDate" class="control-label">
                 <span th:utext="#{task.show.dueDate}">dueDate</span>
             </label>
             <input id="taskDueDate" type="text" th:field="*{dueDate}" class="form-control" />
+            <div th:each="err : ${#fields.errors('dueDate')}">
+                <div class="invalid-feedback" th:text="${err}" >err</div>
+            </div>
         </div>
         <div class="form-group form-control-lg">
-            <div th:each="err : ${#fields.errors('text')}">
-                <div class="alert alert-danger" th:text="${err}" >err</div>
-            </div>
             <label th:for="textEditor" class="control-label">
                 <span th:utext="#{task.show.text}">Text</span>
             </label>
             <textarea id="textEditor" name="textEditor" rows="10" cols="50" class="form-control"
                       th:field="*{text}">Text
             </textarea>
-        </div>
+            <div th:each="err : ${#fields.errors('text')}">
+                <div class="invalid-feedback" th:text="${err}" >err</div>
+            </div>
         <div>
             <span class="form-group form-control-lg">
-                <div th:each="err : ${#fields.errors('taskEnergy')}">
-                    <div class="alert alert-danger" th:text="${err}" >err</div>
-                </div>
                 <label th:for="${#ids.next('taskEnergy')}" class="control-label">
                     <span th:utext="#{task.show.taskEnergy}">taskEnergy</span>
                 </label>
@@ -68,11 +64,11 @@
                         taskEnergyItem
                     </option>
                 </select>
-            </span>&nbsp;
-            <span class="form-group form-control-lg">
                 <div th:each="err : ${#fields.errors('taskEnergy')}">
-                    <div class="alert alert-danger" th:text="${err}" >err</div>
+                    <div class="invalid-feedback" th:text="${err}" >err</div>
                 </div>
+            </span>&nbsp;
+            <span class="form-group form-control-lg">
                 <label th:for="${#ids.next('taskTime')}" class="control-label">
                     <span th:utext="#{task.show.taskTime}">Time</span>
                 </label>
@@ -83,11 +79,11 @@
                         taskTimeItem
                     </option>
                 </select>
+                <div th:each="err : ${#fields.errors('taskEnergy')}">
+                    <div class="invalid-feedback" th:text="${err}" >err</div>
+                </div>
             </span>&nbsp;
             <span class="form-group form-control-lg">
-                <div th:each="err : ${#fields.errors('context.id')}">
-                    <div class="alert alert-danger" th:text="${err}" >err</div>
-                </div>
                 <label th:for="${#ids.next('context.id')}" class="control-label">
                     <span th:utext="#{task.show.context}">Area</span>
                 </label>
@@ -98,6 +94,9 @@
                         contextOption
                     </option>
                 </select>
+                <div th:each="err : ${#fields.errors('context.id')}">
+                    <div class="invalid-feedback" th:text="${err}" >err</div>
+                </div>
             </span>
         </div>
         <input type="hidden"

From 5554779ab79ba83cbd9385602d5d267d6f513074 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 14:03:34 +0200
Subject: [PATCH 17/47] work in progress

---
 .../simpleworklist/context/Context.java       |  6 ++---
 .../context/NewContextForm.java               |  6 ++---
 .../simpleworklist/project/Project.java       |  4 ++--
 .../org/woehlke/simpleworklist/task/Task.java | 24 +++----------------
 .../user/account/UserAccount.java             |  2 +-
 .../user/account/UserAccountForm.java         |  8 +++----
 .../simpleworklist/user/login/LoginForm.java  |  2 +-
 .../user/messages/User2UserMessage.java       |  2 +-
 .../messages/User2UserMessageFormBean.java    |  4 ++--
 .../user/selfservice/UserChangeNameForm.java  |  2 +-
 .../selfservice/UserChangePasswordForm.java   |  2 +-
 11 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/src/main/java/org/woehlke/simpleworklist/context/Context.java b/src/main/java/org/woehlke/simpleworklist/context/Context.java
index 910e9f8a..74e0389f 100644
--- a/src/main/java/org/woehlke/simpleworklist/context/Context.java
+++ b/src/main/java/org/woehlke/simpleworklist/context/Context.java
@@ -6,7 +6,7 @@
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
-import org.hibernate.validator.constraints.SafeHtml;
+//import org.hibernate.validator.constraints.SafeHtml;
 import org.woehlke.simpleworklist.common.AuditModel;
 import org.woehlke.simpleworklist.common.ComparableById;
 import org.woehlke.simpleworklist.user.account.UserAccount;
@@ -64,13 +64,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/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 7a483017..1a1207c6 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/Project.java
+++ b/src/main/java/org/woehlke/simpleworklist/project/Project.java
@@ -15,7 +15,7 @@
 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;
@@ -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)
diff --git a/src/main/java/org/woehlke/simpleworklist/task/Task.java b/src/main/java/org/woehlke/simpleworklist/task/Task.java
index 8463c9ff..c14bfba7 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.*;
@@ -20,10 +19,7 @@
 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;
@@ -100,7 +96,7 @@ public class Task extends AuditModel implements Serializable, ComparableById<Tas
     private Context context;
 
 
-    @SafeHtml(whitelistType= SafeHtml.WhiteListType.NONE)
+    //@SafeHtml(whitelistType= SafeHtml.WhiteListType.NONE)
     @NotBlank
     @Length(min=1,max=255)
     @Column(name = "title", nullable = false)
@@ -148,7 +144,7 @@ public class Task extends AuditModel implements Serializable, ComparableById<Tas
     private long orderIdTaskState;
 
     @Transient
-    public String getTextShortened(){
+    public String getTeaser(){
         StringBuilder sb = new StringBuilder(this.getText());
         if(sb.length() > 50){
             sb.setLength(50);
@@ -158,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);
     }
@@ -381,8 +367,4 @@ public void merge(Task task) {
         this.setTaskEnergy(task.taskEnergy);
         this.setTaskTime(task.taskTime);
     }
-
-    public static Page<Task> getEmptyPage(Pageable request){
-        return new PageImpl<Task>(new ArrayList<Task>(),request,0L);
-    }
 }
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..33d830f4 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccount.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/account/UserAccount.java
@@ -6,7 +6,7 @@
 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;
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/login/LoginForm.java b/src/main/java/org/woehlke/simpleworklist/user/login/LoginForm.java
index 930682ea..be2038c4 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;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessage.java b/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessage.java
index e142452c..fe949ca2 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessage.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessage.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 org.woehlke.simpleworklist.common.AuditModel;
 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/messages/User2UserMessageFormBean.java
index bf734448..059b1d0a 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessageFormBean.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessageFormBean.java
@@ -3,7 +3,7 @@
 
 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/selfservice/UserChangeNameForm.java b/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserChangeNameForm.java
index 39a9ce95..8090ad02 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;
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..aa8e924e 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;

From 71148d9e6279c4be1b6c33a5332b89115a101e95 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 14:26:40 +0200
Subject: [PATCH 18/47] work in progress

---
 .../simpleworklist/user/login/LoginForm.java       |  2 +-
 .../user/messages/User2UserMessage.java            |  2 +-
 .../user/selfservice/UserChangeNameForm.java       |  2 +-
 .../user/selfservice/UserChangePasswordForm.java   |  6 +++---
 src/main/resources/templates/layout/taskedit.html  | 14 +++++++-------
 .../resources/templates/project/id/task/edit.html  |  2 +-
 .../templates/project/root/task/edit.html          |  6 +++---
 .../resources/templates/taskstate/task/edit.html   |  3 ++-
 8 files changed, 19 insertions(+), 18 deletions(-)

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 be2038c4..03d60553 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/login/LoginForm.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/login/LoginForm.java
@@ -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/messages/User2UserMessage.java b/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessage.java
index fe949ca2..61ec0295 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessage.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessage.java
@@ -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/selfservice/UserChangeNameForm.java b/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserChangeNameForm.java
index 8090ad02..5936cca7 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserChangeNameForm.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserChangeNameForm.java
@@ -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 aa8e924e..42ffe301 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserChangePasswordForm.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserChangePasswordForm.java
@@ -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/resources/templates/layout/taskedit.html b/src/main/resources/templates/layout/taskedit.html
index 174c0c15..b5be6d19 100644
--- a/src/main/resources/templates/layout/taskedit.html
+++ b/src/main/resources/templates/layout/taskedit.html
@@ -13,7 +13,7 @@
             <label th:for="${#ids.next('title')}" class="control-label">
                 <span th:utext="#{task.show.title}">Title</span>
             </label>
-            <input type="text" th:field="*{title}" class="form-control" />
+            <input type="text" th:field="*{title}" class="form-control is-invalid" />
             <div th:each="err : ${#fields.errors('title')}">
                 <div class="invalid-feedback" th:text="${err}" >err</div>
             </div>
@@ -22,7 +22,7 @@
             <label th:for="${#ids.next('listTaskState')}" class="control-label">
                 <span th:utext="#{tasks.col.taskState}">taskState</span>
             </label>
-            <select th:field="*{taskState}">
+            <select th:field="*{taskState}" class="form-control is-invalid">
                 <option th:each="taskStateItem : ${listTaskState}"
                         th:value="${taskStateItem.value}"
                         th:text="${#messages.msgOrNull(taskStateItem.code)}">
@@ -37,7 +37,7 @@
             <label for="taskDueDate" class="control-label">
                 <span th:utext="#{task.show.dueDate}">dueDate</span>
             </label>
-            <input id="taskDueDate" type="text" th:field="*{dueDate}" class="form-control" />
+            <input id="taskDueDate" type="text" th:field="*{dueDate}" class="form-control is-invalid" />
             <div th:each="err : ${#fields.errors('dueDate')}">
                 <div class="invalid-feedback" th:text="${err}" >err</div>
             </div>
@@ -46,7 +46,7 @@
             <label th:for="textEditor" class="control-label">
                 <span th:utext="#{task.show.text}">Text</span>
             </label>
-            <textarea id="textEditor" name="textEditor" rows="10" cols="50" class="form-control"
+            <textarea id="textEditor" name="textEditor" rows="10" cols="50" class="form-control is-invalid"
                       th:field="*{text}">Text
             </textarea>
             <div th:each="err : ${#fields.errors('text')}">
@@ -57,7 +57,7 @@
                 <label th:for="${#ids.next('taskEnergy')}" class="control-label">
                     <span th:utext="#{task.show.taskEnergy}">taskEnergy</span>
                 </label>
-                <select th:field="*{taskEnergy}">
+                <select th:field="*{taskEnergy}" class="form-control is-invalid">
                     <option th:each="taskEnergyItem : ${listTaskEnergy}"
                             th:value="${taskEnergyItem.value}"
                             th:text="${#messages.msgOrNull(taskEnergyItem.code)}">
@@ -72,7 +72,7 @@
                 <label th:for="${#ids.next('taskTime')}" class="control-label">
                     <span th:utext="#{task.show.taskTime}">Time</span>
                 </label>
-                <select th:field="*{taskTime}">
+                <select th:field="*{taskTime}" class="form-control is-invalid">
                     <option th:each="taskTimeItem : ${listTaskTime}"
                             th:value="${taskTimeItem.value}"
                             th:text="${#messages.msgOrNull(taskTimeItem.code)}">
@@ -87,7 +87,7 @@
                 <label th:for="${#ids.next('context.id')}" class="control-label">
                     <span th:utext="#{task.show.context}">Area</span>
                 </label>
-                <select th:field="*{context.id}">
+                <select th:field="*{context.id}" class="form-control is-invalid">
                     <option th:each="contextOption : ${contexts}"
                             th:value="${contextOption.id}"
                             th:text="${locale == 'de' ? contextOption.nameDe : contextOption.nameEn}">
diff --git a/src/main/resources/templates/project/id/task/edit.html b/src/main/resources/templates/project/id/task/edit.html
index 3c74f819..b891703b 100644
--- a/src/main/resources/templates/project/id/task/edit.html
+++ b/src/main/resources/templates/project/id/task/edit.html
@@ -19,7 +19,7 @@ <h1>
 
 <div th:fragment="mytwcontent">
 	<div>
-		<form id="formId" th:object="${task}" method="post"
+		<form id="formId" th:object="${task}" method="post" class="was-validated"
               th:action="@{/project/{projectId}/task/{taskId}/edit(taskId=${task.id},projectId=${thisProject.id})}" >
             <div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
 			<a class="btn btn-secondary" role="button"
diff --git a/src/main/resources/templates/project/root/task/edit.html b/src/main/resources/templates/project/root/task/edit.html
index 4c5a99cf..418fc64a 100644
--- a/src/main/resources/templates/project/root/task/edit.html
+++ b/src/main/resources/templates/project/root/task/edit.html
@@ -11,15 +11,15 @@
 
 <div th:fragment="mytwtitle">
 	<!-- Document Window -->
-	<h1>
+	<h1 class="tw-title">
 		<i class="fas fa-edit"></i>&nbsp;
 		<span th:utext="#{task.show.h1}">Edit Task</span>
 	</h1>
 </div>
 
 <div th:fragment="mytwcontent">
-	<div>
-		<form id="formId" method="post"
+	<div class="tw-content">
+		<form id="formId" method="post" class="was-validated"
               th:action="@{/project/root/task/{taskId}/edit(taskId=${task.id})}" th:object="${task}">
             <div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
 			<a th:href="@{/task/{id}/transform(id=${task.id})}" class="btn btn-secondary" role="button">
diff --git a/src/main/resources/templates/taskstate/task/edit.html b/src/main/resources/templates/taskstate/task/edit.html
index 0d04a747..e47b0ea3 100644
--- a/src/main/resources/templates/taskstate/task/edit.html
+++ b/src/main/resources/templates/taskstate/task/edit.html
@@ -19,7 +19,8 @@ <h1>
 
 <div th:fragment="mytwcontent">
 	<div>
-		<form id="formId" th:action="@{/taskstate/task/{taskId}/edit(taskId=${task.id})}" th:object="${task}" method="post">
+		<form id="formId" method="post" class="was-validated"
+              th:action="@{/taskstate/task/{taskId}/edit(taskId=${task.id})}" th:object="${task}">
             <div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
 			<a th:href="@{/taskstate/task/{id}/transform(id=${task.id})}" class="btn btn-secondary" role="button">
 				<i class="fas fa-project-diagram"></i>

From e8bb208e7a71d0ff148b7cd62c245e0f91c69106 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 14:50:51 +0200
Subject: [PATCH 19/47] work in progress

---
 .../resources/templates/layout/taskedit.html  | 203 ++++++++++--------
 1 file changed, 115 insertions(+), 88 deletions(-)

diff --git a/src/main/resources/templates/layout/taskedit.html b/src/main/resources/templates/layout/taskedit.html
index b5be6d19..06eb2f59 100644
--- a/src/main/resources/templates/layout/taskedit.html
+++ b/src/main/resources/templates/layout/taskedit.html
@@ -9,103 +9,130 @@
         <input type="hidden" th:field="*{uuid}" />
         <input type="hidden" th:field="*{focus}" />
         <input type="hidden" th:field="*{rowCreatedAt.time}" />
-        <div class="form-group form-control-lg">
-            <label th:for="${#ids.next('title')}" class="control-label">
-                <span th:utext="#{task.show.title}">Title</span>
-            </label>
-            <input type="text" th:field="*{title}" class="form-control is-invalid" />
-            <div th:each="err : ${#fields.errors('title')}">
-                <div class="invalid-feedback" th:text="${err}" >err</div>
+        <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
+        <div class="form-row">
+            <div class="col-md-12 mb-1">
+                <div class="form-group form-control-lg">
+                    <label th:for="${#ids.next('title')}" class="control-label">
+                        <span th:utext="#{task.show.title}">Title</span>
+                    </label>
+                    <input type="text" th:field="*{title}" class="form-control is-invalid" required/>
+                    <div th:each="err : ${#fields.errors('title')}">
+                        <div class="invalid-feedback" th:text="${err}" >err</div>
+                    </div>
+                </div>
             </div>
         </div>
-        <span class="form-group form-control-lg">
-            <label th:for="${#ids.next('listTaskState')}" class="control-label">
-                <span th:utext="#{tasks.col.taskState}">taskState</span>
-            </label>
-            <select th:field="*{taskState}" class="form-control is-invalid">
-                <option th:each="taskStateItem : ${listTaskState}"
-                        th:value="${taskStateItem.value}"
-                        th:text="${#messages.msgOrNull(taskStateItem.code)}">
-                    taskStateItem
-                </option>
-            </select>
-            <div th:each="err : ${#fields.errors('taskState')}">
-                <div class="invalid-feedback" th:text="${err}" >err</div>
-            </div>
-        </span>
-        <div class="form-group form-control-lg">
-            <label for="taskDueDate" class="control-label">
-                <span th:utext="#{task.show.dueDate}">dueDate</span>
-            </label>
-            <input id="taskDueDate" type="text" th:field="*{dueDate}" class="form-control is-invalid" />
-            <div th:each="err : ${#fields.errors('dueDate')}">
-                <div class="invalid-feedback" th:text="${err}" >err</div>
+        <div class="form-row">
+            <div class="col-md-12 mb-1">
+                <div class="form-group form-control-lg">
+                    <label th:for="${#ids.next('listTaskState')}" class="control-label">
+                        <span th:utext="#{tasks.col.taskState}">taskState</span>
+                    </label>
+                    <select th:field="*{taskState}" class="form-control is-invalid" required>
+                        <option th:each="taskStateItem : ${listTaskState}"
+                                th:value="${taskStateItem.value}"
+                                th:text="${#messages.msgOrNull(taskStateItem.code)}">
+                            taskStateItem
+                        </option>
+                    </select>
+                    <div th:each="err : ${#fields.errors('taskState')}">
+                        <div class="invalid-feedback" th:text="${err}" >err</div>
+                    </div>
+                </div>
             </div>
         </div>
-        <div class="form-group form-control-lg">
-            <label th:for="textEditor" class="control-label">
-                <span th:utext="#{task.show.text}">Text</span>
-            </label>
-            <textarea id="textEditor" name="textEditor" rows="10" cols="50" class="form-control is-invalid"
-                      th:field="*{text}">Text
-            </textarea>
-            <div th:each="err : ${#fields.errors('text')}">
-                <div class="invalid-feedback" th:text="${err}" >err</div>
+        <div class="form-row">
+            <div class="col-md-12 mb-1">
+                <div class="form-group form-control-lg">
+                    <label for="taskDueDate" class="control-label">
+                        <span th:utext="#{task.show.dueDate}">dueDate</span>
+                    </label>
+                    <input id="taskDueDate" type="text" th:field="*{dueDate}" class="form-control is-invalid"/>
+                    <div th:each="err : ${#fields.errors('dueDate')}">
+                        <div class="invalid-feedback" th:text="${err}" >err</div>
+                    </div>
+                </div>
             </div>
-        <div>
-            <span class="form-group form-control-lg">
-                <label th:for="${#ids.next('taskEnergy')}" class="control-label">
-                    <span th:utext="#{task.show.taskEnergy}">taskEnergy</span>
-                </label>
-                <select th:field="*{taskEnergy}" class="form-control is-invalid">
-                    <option th:each="taskEnergyItem : ${listTaskEnergy}"
-                            th:value="${taskEnergyItem.value}"
-                            th:text="${#messages.msgOrNull(taskEnergyItem.code)}">
-                        taskEnergyItem
-                    </option>
-                </select>
-                <div th:each="err : ${#fields.errors('taskEnergy')}">
-                    <div class="invalid-feedback" th:text="${err}" >err</div>
+        </div>
+        <div class="form-row">
+            <div class="col-md-12 mb-1">
+                <div class="form-group form-control-lg">
+                    <label th:for="textEditor" class="control-label">
+                        <span th:utext="#{task.show.text}">Text</span>
+                    </label>
+                    <textarea id="textEditor" name="textEditor" rows="10" cols="50" class="form-control is-invalid"
+                              th:field="*{text}">Text
+                    </textarea>
+                    <div th:each="err : ${#fields.errors('text')}">
+                        <div class="invalid-feedback" th:text="${err}" >err</div>
+                    </div>
                 </div>
-            </span>&nbsp;
-            <span class="form-group form-control-lg">
-                <label th:for="${#ids.next('taskTime')}" class="control-label">
-                    <span th:utext="#{task.show.taskTime}">Time</span>
-                </label>
-                <select th:field="*{taskTime}" class="form-control is-invalid">
-                    <option th:each="taskTimeItem : ${listTaskTime}"
-                            th:value="${taskTimeItem.value}"
-                            th:text="${#messages.msgOrNull(taskTimeItem.code)}">
-                        taskTimeItem
-                    </option>
-                </select>
-                <div th:each="err : ${#fields.errors('taskEnergy')}">
-                    <div class="invalid-feedback" th:text="${err}" >err</div>
+            </div>
+        </div>
+        <div class="form-row">
+            <div class="col-md-6 mb-2">
+                <div class="form-group form-control-lg">
+                    <label th:for="${#ids.next('taskEnergy')}" class="control-label">
+                        <span th:utext="#{task.show.taskEnergy}">taskEnergy</span>
+                    </label>
+                    <select th:field="*{taskEnergy}" class="form-control is-invalid">
+                        <option th:each="taskEnergyItem : ${listTaskEnergy}"
+                                th:value="${taskEnergyItem.value}"
+                                th:text="${#messages.msgOrNull(taskEnergyItem.code)}">
+                            taskEnergyItem
+                        </option>
+                    </select>
+                    <div th:each="err : ${#fields.errors('taskEnergy')}">
+                        <div class="invalid-feedback" th:text="${err}" >err</div>
+                    </div>
                 </div>
-            </span>&nbsp;
-            <span class="form-group form-control-lg">
-                <label th:for="${#ids.next('context.id')}" class="control-label">
-                    <span th:utext="#{task.show.context}">Area</span>
-                </label>
-                <select th:field="*{context.id}" class="form-control is-invalid">
-                    <option th:each="contextOption : ${contexts}"
-                            th:value="${contextOption.id}"
-                            th:text="${locale == 'de' ? contextOption.nameDe : contextOption.nameEn}">
-                        contextOption
-                    </option>
-                </select>
-                <div th:each="err : ${#fields.errors('context.id')}">
-                    <div class="invalid-feedback" th:text="${err}" >err</div>
+            </div>
+            <div class="col-md-6 mb-2">
+                <div class="form-group form-control-lg">
+                    <label th:for="${#ids.next('taskTime')}" class="control-label">
+                        <span th:utext="#{task.show.taskTime}">Time</span>
+                    </label>
+                    <select th:field="*{taskTime}" class="form-control is-invalid">
+                        <option th:each="taskTimeItem : ${listTaskTime}"
+                                th:value="${taskTimeItem.value}"
+                                th:text="${#messages.msgOrNull(taskTimeItem.code)}">
+                            taskTimeItem
+                        </option>
+                    </select>
+                    <div th:each="err : ${#fields.errors('taskEnergy')}">
+                        <div class="invalid-feedback" th:text="${err}" >err</div>
+                    </div>
+                </div>&nbsp;
+            </div>
+        </div>
+        <div class="form-row">
+            <div class="col-md-12 mb-1">
+                <div class="form-group form-control-lg">
+                    <label th:for="${#ids.next('context.id')}" class="control-label">
+                        <span th:utext="#{task.show.context}">Context</span>
+                    </label>
+                    <select th:field="*{context.id}" class="form-control is-invalid">
+                        <option th:each="contextOption : ${contexts}"
+                                th:value="${contextOption.id}"
+                                th:text="${locale == 'de' ? contextOption.nameDe : contextOption.nameEn}">
+                            contextOption
+                        </option>
+                    </select>
+                    <div th:each="err : ${#fields.errors('context.id')}">
+                        <div class="invalid-feedback" th:text="${err}" >err</div>
+                    </div>
                 </div>
-            </span>
+            </div>
+        </div>
+        <div class="form-row">
+            <div class="col-md-12 mb-1">
+                <button id="editTaskSubmit" type="submit" class="btn btn-primary">
+                    <i class="fas fa-save"></i>
+                    <span th:utext="#{task.show.button}">Save Task</span>
+                </button>
+            </div>
         </div>
-        <input type="hidden"
-               name="${_csrf.parameterName}"
-               value="${_csrf.token}"/>
-        <button id="editDataLeaf" type="submit" class="btn btn-primary">
-            <i class="fas fa-save"></i>
-            <span th:utext="#{task.show.button}">Save Task</span>
-        </button>
     </div>
 
 </html>

From 502dcf41d4465e64578b69a59d400fe3761f94f1 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 15:09:10 +0200
Subject: [PATCH 20/47] work in progress

---
 .../resources/templates/layout/taskedit.html  | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/main/resources/templates/layout/taskedit.html b/src/main/resources/templates/layout/taskedit.html
index 06eb2f59..220fa4ae 100644
--- a/src/main/resources/templates/layout/taskedit.html
+++ b/src/main/resources/templates/layout/taskedit.html
@@ -11,12 +11,12 @@
         <input type="hidden" th:field="*{rowCreatedAt.time}" />
         <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
         <div class="form-row">
-            <div class="col-md-12 mb-1">
-                <div class="form-group form-control-lg">
+            <div class="col-md-12 mb-12">
+                <div class="form-group">
                     <label th:for="${#ids.next('title')}" class="control-label">
                         <span th:utext="#{task.show.title}">Title</span>
                     </label>
-                    <input type="text" th:field="*{title}" class="form-control is-invalid" required/>
+                    <input type="text" th:field="*{title}" class="form-control form-control-lg is-invalid" required/>
                     <div th:each="err : ${#fields.errors('title')}">
                         <div class="invalid-feedback" th:text="${err}" >err</div>
                     </div>
@@ -24,12 +24,12 @@
             </div>
         </div>
         <div class="form-row">
-            <div class="col-md-12 mb-1">
-                <div class="form-group form-control-lg">
+            <div class="col-md-12 mb-12">
+                <div class="form-group">
                     <label th:for="${#ids.next('listTaskState')}" class="control-label">
                         <span th:utext="#{tasks.col.taskState}">taskState</span>
                     </label>
-                    <select th:field="*{taskState}" class="form-control is-invalid" required>
+                    <select th:field="*{taskState}" class="form-control form-control-lg is-invalid" required>
                         <option th:each="taskStateItem : ${listTaskState}"
                                 th:value="${taskStateItem.value}"
                                 th:text="${#messages.msgOrNull(taskStateItem.code)}">
@@ -43,12 +43,12 @@
             </div>
         </div>
         <div class="form-row">
-            <div class="col-md-12 mb-1">
-                <div class="form-group form-control-lg">
+            <div class="col-md-12 mb-12">
+                <div class="form-group">
                     <label for="taskDueDate" class="control-label">
                         <span th:utext="#{task.show.dueDate}">dueDate</span>
                     </label>
-                    <input id="taskDueDate" type="text" th:field="*{dueDate}" class="form-control is-invalid"/>
+                    <input id="taskDueDate" type="text" th:field="*{dueDate}" class="form-control form-control-lg is-invalid"/>
                     <div th:each="err : ${#fields.errors('dueDate')}">
                         <div class="invalid-feedback" th:text="${err}" >err</div>
                     </div>
@@ -56,12 +56,12 @@
             </div>
         </div>
         <div class="form-row">
-            <div class="col-md-12 mb-1">
-                <div class="form-group form-control-lg">
+            <div class="col-md-6 mb-6">
+                <div class="form-group">
                     <label th:for="textEditor" class="control-label">
                         <span th:utext="#{task.show.text}">Text</span>
                     </label>
-                    <textarea id="textEditor" name="textEditor" rows="10" cols="50" class="form-control is-invalid"
+                    <textarea id="textEditor" name="textEditor" rows="10" cols="50" class="form-control form-control-lg is-invalid"
                               th:field="*{text}">Text
                     </textarea>
                     <div th:each="err : ${#fields.errors('text')}">
@@ -71,12 +71,12 @@
             </div>
         </div>
         <div class="form-row">
-            <div class="col-md-6 mb-2">
-                <div class="form-group form-control-lg">
+            <div class="col-md-6 mb-6">
+                <div class="form-group">
                     <label th:for="${#ids.next('taskEnergy')}" class="control-label">
                         <span th:utext="#{task.show.taskEnergy}">taskEnergy</span>
                     </label>
-                    <select th:field="*{taskEnergy}" class="form-control is-invalid">
+                    <select th:field="*{taskEnergy}" class="form-control form-control-lg is-invalid">
                         <option th:each="taskEnergyItem : ${listTaskEnergy}"
                                 th:value="${taskEnergyItem.value}"
                                 th:text="${#messages.msgOrNull(taskEnergyItem.code)}">
@@ -88,12 +88,12 @@
                     </div>
                 </div>
             </div>
-            <div class="col-md-6 mb-2">
-                <div class="form-group form-control-lg">
+            <div class="col-md-6 mb-6">
+                <div class="form-group">
                     <label th:for="${#ids.next('taskTime')}" class="control-label">
                         <span th:utext="#{task.show.taskTime}">Time</span>
                     </label>
-                    <select th:field="*{taskTime}" class="form-control is-invalid">
+                    <select th:field="*{taskTime}" class="form-control form-control-lg is-invalid">
                         <option th:each="taskTimeItem : ${listTaskTime}"
                                 th:value="${taskTimeItem.value}"
                                 th:text="${#messages.msgOrNull(taskTimeItem.code)}">
@@ -107,12 +107,12 @@
             </div>
         </div>
         <div class="form-row">
-            <div class="col-md-12 mb-1">
-                <div class="form-group form-control-lg">
+            <div class="col-md-12 mb-12">
+                <div class="form-group">
                     <label th:for="${#ids.next('context.id')}" class="control-label">
                         <span th:utext="#{task.show.context}">Context</span>
                     </label>
-                    <select th:field="*{context.id}" class="form-control is-invalid">
+                    <select th:field="*{context.id}" class="form-control form-control-lg is-invalid">
                         <option th:each="contextOption : ${contexts}"
                                 th:value="${contextOption.id}"
                                 th:text="${locale == 'de' ? contextOption.nameDe : contextOption.nameEn}">
@@ -126,7 +126,7 @@
             </div>
         </div>
         <div class="form-row">
-            <div class="col-md-12 mb-1">
+            <div class="col-md-12 mb-12">
                 <button id="editTaskSubmit" type="submit" class="btn btn-primary">
                     <i class="fas fa-save"></i>
                     <span th:utext="#{task.show.button}">Save Task</span>

From 7edf7ac3d6b005bb9bef9bc76bd82271c61b7b66 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 15:11:19 +0200
Subject: [PATCH 21/47] work in progress

---
 src/main/resources/templates/layout/taskedit.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/templates/layout/taskedit.html b/src/main/resources/templates/layout/taskedit.html
index 220fa4ae..0c9656cb 100644
--- a/src/main/resources/templates/layout/taskedit.html
+++ b/src/main/resources/templates/layout/taskedit.html
@@ -48,7 +48,8 @@
                     <label for="taskDueDate" class="control-label">
                         <span th:utext="#{task.show.dueDate}">dueDate</span>
                     </label>
-                    <input id="taskDueDate" type="text" th:field="*{dueDate}" class="form-control form-control-lg is-invalid"/>
+                    <input id="taskDueDate" type="text" th:field="*{dueDate}"
+                           class="form-control form-control-lg is-invalid"/>
                     <div th:each="err : ${#fields.errors('dueDate')}">
                         <div class="invalid-feedback" th:text="${err}" >err</div>
                     </div>
@@ -61,7 +62,8 @@
                     <label th:for="textEditor" class="control-label">
                         <span th:utext="#{task.show.text}">Text</span>
                     </label>
-                    <textarea id="textEditor" name="textEditor" rows="10" cols="50" class="form-control form-control-lg is-invalid"
+                    <textarea id="textEditor" name="textEditor" rows="10" cols="50"
+                              class="form-control form-control-lg is-invalid"
                               th:field="*{text}">Text
                     </textarea>
                     <div th:each="err : ${#fields.errors('text')}">

From a0b9f457f399b9f1c3d32790a2bd103beee7403f Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 15:14:47 +0200
Subject: [PATCH 22/47] work in progress

---
 src/main/resources/templates/layout/taskedit.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/templates/layout/taskedit.html b/src/main/resources/templates/layout/taskedit.html
index 0c9656cb..78506b86 100644
--- a/src/main/resources/templates/layout/taskedit.html
+++ b/src/main/resources/templates/layout/taskedit.html
@@ -57,7 +57,7 @@
             </div>
         </div>
         <div class="form-row">
-            <div class="col-md-6 mb-6">
+            <div class="col-md-12 mb-12">
                 <div class="form-group">
                     <label th:for="textEditor" class="control-label">
                         <span th:utext="#{task.show.text}">Text</span>

From aa348337f043545af7a5ba32d5403917202c1716 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 15:22:07 +0200
Subject: [PATCH 23/47] work in progress

---
 .../resources/templates/layout/taskedit.html  |  8 --------
 .../templates/project/id/task/edit.html       | 20 ++++++++++++++-----
 .../templates/project/root/task/edit.html     | 18 +++++++++++++----
 .../templates/taskstate/task/edit.html        | 18 +++++++++++++----
 4 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/src/main/resources/templates/layout/taskedit.html b/src/main/resources/templates/layout/taskedit.html
index 78506b86..953f2499 100644
--- a/src/main/resources/templates/layout/taskedit.html
+++ b/src/main/resources/templates/layout/taskedit.html
@@ -127,14 +127,6 @@
                 </div>
             </div>
         </div>
-        <div class="form-row">
-            <div class="col-md-12 mb-12">
-                <button id="editTaskSubmit" type="submit" class="btn btn-primary">
-                    <i class="fas fa-save"></i>
-                    <span th:utext="#{task.show.button}">Save Task</span>
-                </button>
-            </div>
-        </div>
     </div>
 
 </html>
diff --git a/src/main/resources/templates/project/id/task/edit.html b/src/main/resources/templates/project/id/task/edit.html
index b891703b..5d0ba90a 100644
--- a/src/main/resources/templates/project/id/task/edit.html
+++ b/src/main/resources/templates/project/id/task/edit.html
@@ -22,11 +22,21 @@ <h1>
 		<form id="formId" th:object="${task}" method="post" class="was-validated"
               th:action="@{/project/{projectId}/task/{taskId}/edit(taskId=${task.id},projectId=${thisProject.id})}" >
             <div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
-			<a class="btn btn-secondary" role="button"
-               th:href="@{/project/{projectId}/task/{id}/transform(id=${task.id},projectId=${thisProject.id})}">
-				<i class="fas fa-project-diagram"></i>
-				<span th:utext="#{task.show.transform}">Transform into Project</span>
-			</a>
+            <div class="form-row">
+                <div class="col-md-6 mb-6">
+                    <button id="editTaskSubmit" type="submit" class="btn btn-primary">
+                        <i class="fas fa-save"></i>
+                        <span th:utext="#{task.show.button}">Save Task</span>
+                    </button>
+                </div>
+                <div class="col-md-6 mb-6">
+                    <a class="btn btn-secondary" role="button"
+                       th:href="@{/project/{projectId}/task/{id}/transform(id=${task.id},projectId=${thisProject.id})}">
+                        <i class="fas fa-project-diagram"></i>
+                        <span th:utext="#{task.show.transform}">Transform into Project</span>
+                    </a>
+                </div>
+            </div>
 		</form>
 	</div>
 </div>
diff --git a/src/main/resources/templates/project/root/task/edit.html b/src/main/resources/templates/project/root/task/edit.html
index 418fc64a..88dec168 100644
--- a/src/main/resources/templates/project/root/task/edit.html
+++ b/src/main/resources/templates/project/root/task/edit.html
@@ -22,10 +22,20 @@ <h1 class="tw-title">
 		<form id="formId" method="post" class="was-validated"
               th:action="@{/project/root/task/{taskId}/edit(taskId=${task.id})}" th:object="${task}">
             <div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
-			<a th:href="@{/task/{id}/transform(id=${task.id})}" class="btn btn-secondary" role="button">
-				<i class="fas fa-project-diagram"></i>
-				<span th:utext="#{task.show.transform}">Transform into Project</span>
-			</a>
+            <div class="form-row">
+                <div class="col-md-6 mb-6">
+                    <button id="editTaskSubmit" type="submit" class="btn btn-primary">
+                        <i class="fas fa-save"></i>
+                        <span th:utext="#{task.show.button}">Save Task</span>
+                    </button>
+                </div>
+                <div class="col-md-6 mb-6">
+                    <a th:href="@{/task/{id}/transform(id=${task.id})}" class="btn btn-secondary" role="button">
+                        <i class="fas fa-project-diagram"></i>
+                        <span th:utext="#{task.show.transform}">Transform into Project</span>
+                    </a>
+                </div>
+            </div>
 		</form>
 	</div>
 </div>
diff --git a/src/main/resources/templates/taskstate/task/edit.html b/src/main/resources/templates/taskstate/task/edit.html
index e47b0ea3..903b8173 100644
--- a/src/main/resources/templates/taskstate/task/edit.html
+++ b/src/main/resources/templates/taskstate/task/edit.html
@@ -22,10 +22,20 @@ <h1>
 		<form id="formId" method="post" class="was-validated"
               th:action="@{/taskstate/task/{taskId}/edit(taskId=${task.id})}" th:object="${task}">
             <div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
-			<a th:href="@{/taskstate/task/{id}/transform(id=${task.id})}" class="btn btn-secondary" role="button">
-				<i class="fas fa-project-diagram"></i>
-				<span th:utext="#{task.show.transform}">Transform into Project</span>
-			</a>
+            <div class="form-row">
+                <div class="col-md-6 mb-6">
+                    <button id="editTaskSubmit" type="submit" class="btn btn-primary">
+                        <i class="fas fa-save"></i>
+                        <span th:utext="#{task.show.button}">Save Task</span>
+                    </button>
+                </div>
+                <div class="col-md-6 mb-6">
+                    <a th:href="@{/taskstate/task/{id}/transform(id=${task.id})}" class="btn btn-secondary" role="button">
+                        <i class="fas fa-project-diagram"></i>
+                        <span th:utext="#{task.show.transform}">Transform into Project</span>
+                    </a>
+                </div>
+            </div>
 		</form>
 	</div>
 </div>

From 674088e39bb6f02ddbd390f6a081a6a3b613291f Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 16:08:38 +0200
Subject: [PATCH 24/47] work in progress

---
 .../resources/templates/layout/taskedit.html  | 14 ++---
 .../templates/project/id/task/edit.html       |  4 +-
 .../templates/project/root/task/edit.html     |  4 +-
 .../templates/taskstate/task/edit.html        |  4 +-
 .../templates/user/login/loginForm.html       | 56 ++++++++++++-------
 .../templates/user/messages/all.html          |  2 +-
 6 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/src/main/resources/templates/layout/taskedit.html b/src/main/resources/templates/layout/taskedit.html
index 953f2499..482671da 100644
--- a/src/main/resources/templates/layout/taskedit.html
+++ b/src/main/resources/templates/layout/taskedit.html
@@ -24,7 +24,7 @@
             </div>
         </div>
         <div class="form-row">
-            <div class="col-md-12 mb-12">
+            <div class="col-md-6 mb-6">
                 <div class="form-group">
                     <label th:for="${#ids.next('listTaskState')}" class="control-label">
                         <span th:utext="#{tasks.col.taskState}">taskState</span>
@@ -41,9 +41,7 @@
                     </div>
                 </div>
             </div>
-        </div>
-        <div class="form-row">
-            <div class="col-md-12 mb-12">
+            <div class="col-md-6 mb-6">
                 <div class="form-group">
                     <label for="taskDueDate" class="control-label">
                         <span th:utext="#{task.show.dueDate}">dueDate</span>
@@ -73,7 +71,7 @@
             </div>
         </div>
         <div class="form-row">
-            <div class="col-md-6 mb-6">
+            <div class="col-md-4 mb-4">
                 <div class="form-group">
                     <label th:for="${#ids.next('taskEnergy')}" class="control-label">
                         <span th:utext="#{task.show.taskEnergy}">taskEnergy</span>
@@ -90,7 +88,7 @@
                     </div>
                 </div>
             </div>
-            <div class="col-md-6 mb-6">
+            <div class="col-md-4 mb-4">
                 <div class="form-group">
                     <label th:for="${#ids.next('taskTime')}" class="control-label">
                         <span th:utext="#{task.show.taskTime}">Time</span>
@@ -107,9 +105,7 @@
                     </div>
                 </div>&nbsp;
             </div>
-        </div>
-        <div class="form-row">
-            <div class="col-md-12 mb-12">
+            <div class="col-md-4 mb-4">
                 <div class="form-group">
                     <label th:for="${#ids.next('context.id')}" class="control-label">
                         <span th:utext="#{task.show.context}">Context</span>
diff --git a/src/main/resources/templates/project/id/task/edit.html b/src/main/resources/templates/project/id/task/edit.html
index 5d0ba90a..84147ba6 100644
--- a/src/main/resources/templates/project/id/task/edit.html
+++ b/src/main/resources/templates/project/id/task/edit.html
@@ -24,13 +24,13 @@ <h1>
             <div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
             <div class="form-row">
                 <div class="col-md-6 mb-6">
-                    <button id="editTaskSubmit" type="submit" class="btn btn-primary">
+                    <button id="editTaskSubmit" type="submit" class="btn btn-primary btn-block">
                         <i class="fas fa-save"></i>
                         <span th:utext="#{task.show.button}">Save Task</span>
                     </button>
                 </div>
                 <div class="col-md-6 mb-6">
-                    <a class="btn btn-secondary" role="button"
+                    <a class="btn btn-secondary btn-block" role="button"
                        th:href="@{/project/{projectId}/task/{id}/transform(id=${task.id},projectId=${thisProject.id})}">
                         <i class="fas fa-project-diagram"></i>
                         <span th:utext="#{task.show.transform}">Transform into Project</span>
diff --git a/src/main/resources/templates/project/root/task/edit.html b/src/main/resources/templates/project/root/task/edit.html
index 88dec168..7194decb 100644
--- a/src/main/resources/templates/project/root/task/edit.html
+++ b/src/main/resources/templates/project/root/task/edit.html
@@ -24,13 +24,13 @@ <h1 class="tw-title">
             <div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
             <div class="form-row">
                 <div class="col-md-6 mb-6">
-                    <button id="editTaskSubmit" type="submit" class="btn btn-primary">
+                    <button id="editTaskSubmit" type="submit" class="btn btn-primary btn-block">
                         <i class="fas fa-save"></i>
                         <span th:utext="#{task.show.button}">Save Task</span>
                     </button>
                 </div>
                 <div class="col-md-6 mb-6">
-                    <a th:href="@{/task/{id}/transform(id=${task.id})}" class="btn btn-secondary" role="button">
+                    <a th:href="@{/task/{id}/transform(id=${task.id})}" class="btn btn-secondary btn-block" role="button">
                         <i class="fas fa-project-diagram"></i>
                         <span th:utext="#{task.show.transform}">Transform into Project</span>
                     </a>
diff --git a/src/main/resources/templates/taskstate/task/edit.html b/src/main/resources/templates/taskstate/task/edit.html
index 903b8173..e8202b05 100644
--- a/src/main/resources/templates/taskstate/task/edit.html
+++ b/src/main/resources/templates/taskstate/task/edit.html
@@ -24,13 +24,13 @@ <h1>
             <div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
             <div class="form-row">
                 <div class="col-md-6 mb-6">
-                    <button id="editTaskSubmit" type="submit" class="btn btn-primary">
+                    <button id="editTaskSubmit" type="submit" class="btn btn-primary btn-block">
                         <i class="fas fa-save"></i>
                         <span th:utext="#{task.show.button}">Save Task</span>
                     </button>
                 </div>
                 <div class="col-md-6 mb-6">
-                    <a th:href="@{/taskstate/task/{id}/transform(id=${task.id})}" class="btn btn-secondary" role="button">
+                    <a th:href="@{/taskstate/task/{id}/transform(id=${task.id})}" class="btn btn-secondary btn-block" role="button">
                         <i class="fas fa-project-diagram"></i>
                         <span th:utext="#{task.show.transform}">Transform into Project</span>
                     </a>
diff --git a/src/main/resources/templates/user/login/loginForm.html b/src/main/resources/templates/user/login/loginForm.html
index e48a757c..2138a5f6 100644
--- a/src/main/resources/templates/user/login/loginForm.html
+++ b/src/main/resources/templates/user/login/loginForm.html
@@ -24,28 +24,44 @@ <h2><span th:utext="#{user.loginForm.h2}">Your Todo-List for Getting Things Done
 					</a>.
 				</div>
 				<div class="card-body">
-					<div class="alert alert-danger" role="alert" th:if="${param.login_error != null}">
+					<div class="invalid-feedback" role="alert" th:if="${param.login_error != null}">
 						<span th:text="#{user.loginForm.loginError}">Your login attempt was not successful, try again.</span>
 					</div>
-					<input type="hidden"
-						   name="${_csrf.parameterName}"
-						   value="${_csrf.token}"/>
-					<div class="form-group form-control-lg">
-						<label for="j_username">Email</label>
-						<input id="j_username" type="email" name="j_username" class="form-control" placeholder="Enter email"/>
-					</div>
-					<div class="form-group form-control-lg">
-						<label for="j_password" th:text="#{user.loginForm.password}">Password</label>
-						<input id="j_password" type="password" name="j_password" class="form-control" placeholder="Password"/>
-					</div>
-					<button id="loginButton" type="submit" class="btn btn-primary">
-						<i class="fas fa-sign-in-alt"></i>
-						<span th:utext="#{user.loginForm.loginButton}"></span>
-					</button>
-					<a th:href="@{/user/resetPassword}" class="btn btn-secondary" role="button">
-						<i class="fas fa-question-circle"></i>
-						<span th:utext="#{user.loginForm.passwordReset}">Password forgotten?</span>
-					</a>
+					<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
+                    <div class="form-row">
+                        <div class="col-md-12 mb-12">
+                            <div class="form-group">
+                                <label for="j_username" th:text="#{user.loginForm.email.label}">Email</label>
+                                <input id="j_username" type="email" class="form-control form-control-lg"
+                                       name="j_username"
+                                       th:placeholder="#{user.loginForm.email.placeholder}"/>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="form-row">
+                        <div class="col-md-12 mb-12">
+                            <div class="form-group">
+                                <label for="j_password" th:text="#{user.loginForm.password.label}">Password</label>
+                                <input id="j_password" type="password" class="form-control form-control-lg"
+                                       name="j_password"
+                                       th:placeholder="#{user.loginForm.password.placeholder}"/>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="form-row">
+                        <div class="col-md-6 mb-6">
+                            <button id="loginButton" type="submit" class="btn btn-block btn-primary">
+                                <i class="fas fa-sign-in-alt"></i>
+                                <span th:utext="#{user.loginForm.loginButton}"></span>
+                            </button>
+                        </div>
+                        <div class="col-md-6 mb-6">
+                            <a th:href="@{/user/resetPassword}" class="btn btn-block btn-secondary" role="button">
+                                <i class="fas fa-question-circle"></i>
+                                <span th:utext="#{user.loginForm.passwordReset}">Password forgotten?</span>
+                            </a>
+                        </div>
+                    </div>
 				</div>
 			</div>
 		</form>
diff --git a/src/main/resources/templates/user/messages/all.html b/src/main/resources/templates/user/messages/all.html
index 4cddba33..c9a7928d 100644
--- a/src/main/resources/templates/user/messages/all.html
+++ b/src/main/resources/templates/user/messages/all.html
@@ -46,7 +46,7 @@ <h1>
                                       th:field="*{messageText}" class="form-control" />
                             <div>
                                 <div th:each="err : ${#fields.errors('messageText')}"
-                                     th:text="${err}" class="alert alert-danger" />
+                                     th:text="${err}" class="invalid-feedback" />
                             </div>
                         </div>
                         <div class="form-group form-control-lg">

From d4069a47cf199c6139fcef213138ad511a4c57b7 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 16:29:17 +0200
Subject: [PATCH 25/47] work in progress

---
 src/main/resources/messages_de.properties     | 74 ++++++++++---------
 src/main/resources/messages_en.properties     |  5 ++
 .../templates/user/login/loginForm.html       | 14 +++-
 3 files changed, 55 insertions(+), 38 deletions(-)

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 &auml;ndern
+pages.user.profile.change.contexts=Kontexte &auml;ndern
 pages.user.profile.add.context=Weiteren Kontext hinzuf&uuml;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 &auml;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 &auml;ndern
+project.show.delete=Projekt l&ouml;schen
 project.show.addTask=Neue Aufgabe
 project.show.title=Aufgabe
 project.show.text=Text
-project.show.dueDate=Fälligkeitsdatum
+project.show.dueDate=F&auml;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&auml;chstes
 project.show.state.waiting=Warten
 project.show.state.scheduled=Eingeplant
-project.show.state.someday=Später
+project.show.state.someday=Sp&auml;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&auml;chstes
 layout.page.waiting=Warten
 layout.page.scheduled=Eingeplant
-layout.page.someday=Später
+layout.page.someday=S&auml;ä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&auml;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&auml;chstes
 searchRequest.resultlist.tasks.waiting=Warten
 searchRequest.resultlist.tasks.scheduled=Eingeplant
-searchRequest.resultlist.tasks.someday=Später
+searchRequest.resultlist.tasks.someday=Sp&auml;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&auml;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&auml;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=<i class="fas fa-edit"></i>&nbsp;Aufgabe berarbeiten
+task.show.button.edit=<i class="fas fa-edit"></i>&nbsp;Aufgabe bearbeiten
 task.show.button.close=zur&uuml;ck
 right.nav.projects=Projekte
-task.show.h1=Aufgaben ändern
+task.show.h1=Aufgaben &auml;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&auml;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&auml;chstes
 tasks.scheduled.h1=Eingeplant
 tasks.scheduled.title=Aufgabe
 tasks.scheduled.text=Text
-tasks.scheduled.dueDate=Fälligkeitsdatum
+tasks.scheduled.dueDate=F&auml;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&uuml;r später
+tasks.someday.noTasks=Sie haben keine Aufgaben f&uuml;r sp&auml;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 &auml;ndern\:
+user.selfservice.profile.changePassword=Passwort &auml;ndern
+user.selfservice.profile.changeContexts=Kontexte &auml;ndern
 user.selfservice.profile.changeLanguage=Sprache einstellen
-button.back=<i class="fas fa-angle-double-left"></i>&nbsp;zur�ck
+button.back=<i class="fas fa-angle-double-left"></i>&nbsp;zur&uuml;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&uuml;r Benutzer\:
+user.selfservice.contexts.add.button=Neuen Kontext hinzuf&uuml;gen
+user.selfservice.contexts.edit=Kontext &Auml;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 &Auml;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&ouml;nnen Sie die Aufgabe als erledigt markieren
+task.col.twtooltip.infoicons.unfinish.task=Hier k&ouml;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&ouml;nnen Sie die Aufgabe aus dem Fokus nehmen
+task.col.twtooltip.infoicons.setfocus=Hier k&ouml;nnen Sie die Aufgabe in den Fokus nehmen
+task.col.twtooltip.show.details=Hier k&ouml;nnen Sie sich alle Informationen zu dieser Aufgabe anzeigen lassen
+task.col.twtooltip.duedate=F&auml;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=&nbsp;
 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=&nbsp;
 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/user/login/loginForm.html b/src/main/resources/templates/user/login/loginForm.html
index 2138a5f6..5ffd3542 100644
--- a/src/main/resources/templates/user/login/loginForm.html
+++ b/src/main/resources/templates/user/login/loginForm.html
@@ -49,18 +49,26 @@ <h2><span th:utext="#{user.loginForm.h2}">Your Todo-List for Getting Things Done
                         </div>
                     </div>
                     <div class="form-row">
-                        <div class="col-md-6 mb-6">
+                        <div class="col-md-4 mb-4">
                             <button id="loginButton" type="submit" class="btn btn-block btn-primary">
                                 <i class="fas fa-sign-in-alt"></i>
                                 <span th:utext="#{user.loginForm.loginButton}"></span>
                             </button>
                         </div>
-                        <div class="col-md-6 mb-6">
-                            <a th:href="@{/user/resetPassword}" class="btn btn-block btn-secondary" role="button">
+                        <div class="col-md-4 mb-4">
+                            <a id="passwordResetButton" th:href="@{/user/resetPassword}" role="button"
+                               class="btn btn-block btn-secondary">
                                 <i class="fas fa-question-circle"></i>
                                 <span th:utext="#{user.loginForm.passwordReset}">Password forgotten?</span>
                             </a>
                         </div>
+                        <div class="col-md-4 mb-4">
+                            <a id="registerButton" th:href="@{/user/register}" role="button"
+                               class="btn btn-block btn-secondary">
+                                <i class="fas fa-user"></i>
+                                <span th:utext="#{user.loginForm.register}">register as new user</span>
+                            </a>
+                        </div>
                     </div>
 				</div>
 			</div>

From b362047dc1fb994cffb4c6ec1786d7d8f2070f52 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 16:36:14 +0200
Subject: [PATCH 26/47] work in progress

---
 .gitignore                                           |  2 +-
 etc/TODO.md                                          |  2 +-
 etc/serialversions/getserialversionid.cmd            |  6 +++---
 etc/serialversions/serialversions.txt                |  6 +++---
 .../simpleworklist/SimpleworklistApplication.java    |  6 +++---
 .../{ => application}/common/AbstractController.java |  4 ++--
 .../{ => application}/common/AuditModel.java         |  3 +--
 .../{ => application}/common/ComparableById.java     |  2 +-
 .../config/ApplicationProperties.java                |  2 +-
 .../{ => application}/config/di/WebMvcConfig.java    |  4 ++--
 .../config/di/WebSecurityConfig.java                 |  4 ++--
 .../config/listener/ContextRefreshedListener.java    |  2 +-
 .../config/listener/ContextStartedListener.java      |  2 +-
 .../{ => application}/error/MyErrorController.java   |  5 +----
 .../application/error/MyErrorControllerTest.java     |  4 ++++
 .../{ => application}/language/Language.java         |  2 +-
 .../language/UserChangeLanguageForm.java             |  2 +-
 .../org/woehlke/simpleworklist/context/Context.java  |  7 ++-----
 .../simpleworklist/context/ContextController.java    |  2 +-
 .../org/woehlke/simpleworklist/project/Project.java  |  4 ++--
 .../simpleworklist/project/ProjectController.java    |  2 +-
 .../project/ProjectControllerRoot.java               |  2 +-
 .../simpleworklist/search/SearchController.java      |  3 +--
 .../woehlke/simpleworklist/search/SearchRequest.java |  4 ++--
 .../woehlke/simpleworklist/search/SearchResult.java  |  4 ++--
 .../java/org/woehlke/simpleworklist/task/Task.java   |  4 ++--
 .../simpleworklist/task/TaskStateTabController.java  |  2 +-
 .../simpleworklist/task/TaskStateTaskController.java |  2 +-
 .../simpleworklist/testdata/TestDataController.java  |  2 +-
 .../simpleworklist/user/account/UserAccount.java     |  6 +++---
 .../user/account/UserAccountPassword.java            |  4 ++--
 .../user/account/UserAccountServiceImpl.java         |  3 +--
 .../user/messages/User2UserMessage.java              |  2 +-
 .../user/messages/User2UserMessageController.java    |  2 +-
 .../user/register/UserRegistration.java              |  2 +-
 .../user/register/UserRegistrationServiceImpl.java   |  4 +---
 .../user/resetpassword/UserPasswordRecovery.java     |  2 +-
 .../UserPasswordRecoveryServiceImpl.java             |  4 +---
 .../user/selfservice/UserSelfserviceController.java  |  6 +++---
 src/main/resources/logback.xml                       |  4 ++--
 .../java/org/woehlke/simpleworklist/SmokeTests.java  | 12 ++----------
 .../{ => application}/config/AbstractTest.java       |  2 +-
 .../config/FunctionalRequirements.java               |  2 +-
 .../{ => application}/config/Requirements.java       |  2 +-
 .../config/UserAccountTestDataService.java           |  2 +-
 .../config/UserAccountTestDataServiceImpl.java       |  4 ++--
 .../simpleworklist/error/MyErrorControllerTest.java  |  4 ----
 .../simpleworklist/testdata/TestDataServiceTest.java |  2 +-
 .../user/account/UserAccountPasswordEncodedTest.java |  2 +-
 .../user/account/UserAccountServiceImplTest.java     |  2 +-
 .../user/login/UserLoginControllerTest.java          |  2 +-
 .../register/UserRegistrationControllerTest.java     |  2 +-
 .../register/UserRegistrationServiceImplTest.java    |  2 +-
 .../UserPasswordRecoveryControllerTest.java          |  2 +-
 54 files changed, 78 insertions(+), 99 deletions(-)
 rename src/main/java/org/woehlke/simpleworklist/{ => application}/common/AbstractController.java (97%)
 rename src/main/java/org/woehlke/simpleworklist/{ => application}/common/AuditModel.java (96%)
 rename src/main/java/org/woehlke/simpleworklist/{ => application}/common/ComparableById.java (77%)
 rename src/main/java/org/woehlke/simpleworklist/{ => application}/config/ApplicationProperties.java (97%)
 rename src/main/java/org/woehlke/simpleworklist/{ => application}/config/di/WebMvcConfig.java (97%)
 rename src/main/java/org/woehlke/simpleworklist/{ => application}/config/di/WebSecurityConfig.java (97%)
 rename src/main/java/org/woehlke/simpleworklist/{ => application}/config/listener/ContextRefreshedListener.java (94%)
 rename src/main/java/org/woehlke/simpleworklist/{ => application}/config/listener/ContextStartedListener.java (94%)
 rename src/main/java/org/woehlke/simpleworklist/{ => application}/error/MyErrorController.java (94%)
 create mode 100644 src/main/java/org/woehlke/simpleworklist/application/error/MyErrorControllerTest.java
 rename src/main/java/org/woehlke/simpleworklist/{ => application}/language/Language.java (92%)
 rename src/main/java/org/woehlke/simpleworklist/{ => application}/language/UserChangeLanguageForm.java (87%)
 rename src/test/java/org/woehlke/simpleworklist/{ => application}/config/AbstractTest.java (98%)
 rename src/test/java/org/woehlke/simpleworklist/{ => application}/config/FunctionalRequirements.java (95%)
 rename src/test/java/org/woehlke/simpleworklist/{ => application}/config/Requirements.java (96%)
 rename src/test/java/org/woehlke/simpleworklist/{ => application}/config/UserAccountTestDataService.java (75%)
 rename src/test/java/org/woehlke/simpleworklist/{ => application}/config/UserAccountTestDataServiceImpl.java (96%)
 delete mode 100644 src/test/java/org/woehlke/simpleworklist/error/MyErrorControllerTest.java

diff --git a/.gitignore b/.gitignore
index 2ed5f32f..7bfa43e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,7 +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/etc/TODO.md b/etc/TODO.md
index ab41c606..76e655da 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
diff --git a/etc/serialversions/getserialversionid.cmd b/etc/serialversions/getserialversionid.cmd
index f6356f93..3aecc945 100644
--- a/etc/serialversions/getserialversionid.cmd
+++ b/etc/serialversions/getserialversionid.cmd
@@ -15,14 +15,14 @@ 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
@@ -38,7 +38,7 @@ serialver org.woehlke.simpleworklist.user.messages.User2UserMessageFormBean >> .
 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
diff --git a/etc/serialversions/serialversions.txt b/etc/serialversions/serialversions.txt
index 14da4161..5a4859e0 100644
--- a/etc/serialversions/serialversions.txt
+++ b/etc/serialversions/serialversions.txt
@@ -1,11 +1,11 @@
-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;
@@ -21,7 +21,7 @@ org.woehlke.simpleworklist.user.messages.User2UserMessageFormBean:    private st
 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;
diff --git a/src/main/java/org/woehlke/simpleworklist/SimpleworklistApplication.java b/src/main/java/org/woehlke/simpleworklist/SimpleworklistApplication.java
index e13fdaa8..d1376b9a 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.config.ApplicationProperties;
+import org.woehlke.simpleworklist.application.config.di.WebMvcConfig;
+import org.woehlke.simpleworklist.application.config.di.WebSecurityConfig;
 
 
 @ImportAutoConfiguration({
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 97%
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..c10263c2 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.config.ApplicationProperties;
 import org.woehlke.simpleworklist.context.Context;
 import org.woehlke.simpleworklist.project.Project;
 import org.woehlke.simpleworklist.task.TaskService;
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<T extends AuditModel> {
     boolean equalsById(T otherObject);
diff --git a/src/main/java/org/woehlke/simpleworklist/config/ApplicationProperties.java b/src/main/java/org/woehlke/simpleworklist/application/config/ApplicationProperties.java
similarity index 97%
rename from src/main/java/org/woehlke/simpleworklist/config/ApplicationProperties.java
rename to src/main/java/org/woehlke/simpleworklist/application/config/ApplicationProperties.java
index d021948a..de7c5401 100644
--- a/src/main/java/org/woehlke/simpleworklist/config/ApplicationProperties.java
+++ b/src/main/java/org/woehlke/simpleworklist/application/config/ApplicationProperties.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.config;
+package org.woehlke.simpleworklist.application.config;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/org/woehlke/simpleworklist/config/di/WebMvcConfig.java b/src/main/java/org/woehlke/simpleworklist/application/config/di/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/di/WebMvcConfig.java
index c91475bd..9936e21d 100644
--- a/src/main/java/org/woehlke/simpleworklist/config/di/WebMvcConfig.java
+++ b/src/main/java/org/woehlke/simpleworklist/application/config/di/WebMvcConfig.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.config.di;
+package org.woehlke.simpleworklist.application.config.di;
 
 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.config.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/di/WebSecurityConfig.java
similarity index 97%
rename from src/main/java/org/woehlke/simpleworklist/config/di/WebSecurityConfig.java
rename to src/main/java/org/woehlke/simpleworklist/application/config/di/WebSecurityConfig.java
index 1f435cb9..8a54030e 100644
--- a/src/main/java/org/woehlke/simpleworklist/config/di/WebSecurityConfig.java
+++ b/src/main/java/org/woehlke/simpleworklist/application/config/di/WebSecurityConfig.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.config.di;
+package org.woehlke.simpleworklist.application.config.di;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
@@ -19,7 +19,7 @@
 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.config.ApplicationProperties;
 import org.woehlke.simpleworklist.user.login.LoginSuccessHandler;
 import org.woehlke.simpleworklist.user.account.UserAccountSecurityService;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/config/listener/ContextRefreshedListener.java b/src/main/java/org/woehlke/simpleworklist/application/config/listener/ContextRefreshedListener.java
similarity index 94%
rename from src/main/java/org/woehlke/simpleworklist/config/listener/ContextRefreshedListener.java
rename to src/main/java/org/woehlke/simpleworklist/application/config/listener/ContextRefreshedListener.java
index 2c789dd6..0e520492 100644
--- a/src/main/java/org/woehlke/simpleworklist/config/listener/ContextRefreshedListener.java
+++ b/src/main/java/org/woehlke/simpleworklist/application/config/listener/ContextRefreshedListener.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.config.listener;
+package org.woehlke.simpleworklist.application.config.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/config/listener/ContextStartedListener.java
similarity index 94%
rename from src/main/java/org/woehlke/simpleworklist/config/listener/ContextStartedListener.java
rename to src/main/java/org/woehlke/simpleworklist/application/config/listener/ContextStartedListener.java
index 090b1756..ccbaae08 100644
--- a/src/main/java/org/woehlke/simpleworklist/config/listener/ContextStartedListener.java
+++ b/src/main/java/org/woehlke/simpleworklist/application/config/listener/ContextStartedListener.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.config.listener;
+package org.woehlke.simpleworklist.application.config.listener;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
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/context/Context.java b/src/main/java/org/woehlke/simpleworklist/context/Context.java
index 74e0389f..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.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;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/context/ContextController.java b/src/main/java/org/woehlke/simpleworklist/context/ContextController.java
index d0a7cf2b..1e4772a4 100644
--- a/src/main/java/org/woehlke/simpleworklist/context/ContextController.java
+++ b/src/main/java/org/woehlke/simpleworklist/context/ContextController.java
@@ -7,7 +7,7 @@
 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.application.common.AbstractController;
 import org.woehlke.simpleworklist.session.UserSessionBean;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/woehlke/simpleworklist/project/Project.java b/src/main/java/org/woehlke/simpleworklist/project/Project.java
index 1a1207c6..f690c2b5 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/Project.java
+++ b/src/main/java/org/woehlke/simpleworklist/project/Project.java
@@ -17,8 +17,8 @@
 import javax.validation.constraints.NotBlank;
 //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
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
index 7a07efac..7c52bb2a 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
+++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
@@ -11,7 +11,7 @@
 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;
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java
index 3b9d9f78..54186094 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java
+++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java
@@ -13,7 +13,7 @@
 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.common.AbstractController;
 import org.woehlke.simpleworklist.context.Context;
 import org.woehlke.simpleworklist.task.*;
 import org.woehlke.simpleworklist.session.UserSessionBean;
diff --git a/src/main/java/org/woehlke/simpleworklist/search/SearchController.java b/src/main/java/org/woehlke/simpleworklist/search/SearchController.java
index 874a059c..050b3318 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.application.common.AbstractController;
 import org.woehlke.simpleworklist.breadcrumb.Breadcrumb;
 import org.woehlke.simpleworklist.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 c14bfba7..0c9059b8 100644
--- a/src/main/java/org/woehlke/simpleworklist/task/Task.java
+++ b/src/main/java/org/woehlke/simpleworklist/task/Task.java
@@ -24,8 +24,8 @@
 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;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskStateTabController.java b/src/main/java/org/woehlke/simpleworklist/task/TaskStateTabController.java
index f0f5c186..a85836d2 100644
--- a/src/main/java/org/woehlke/simpleworklist/task/TaskStateTabController.java
+++ b/src/main/java/org/woehlke/simpleworklist/task/TaskStateTabController.java
@@ -10,7 +10,7 @@
 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;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java b/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java
index 3af50692..0a716064 100644
--- a/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java
+++ b/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java
@@ -8,7 +8,7 @@
 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.common.AbstractController;
 import org.woehlke.simpleworklist.context.Context;
 import org.woehlke.simpleworklist.project.Project;
 import org.woehlke.simpleworklist.session.UserSessionBean;
diff --git a/src/main/java/org/woehlke/simpleworklist/testdata/TestDataController.java b/src/main/java/org/woehlke/simpleworklist/testdata/TestDataController.java
index e02d736e..a55e4441 100644
--- a/src/main/java/org/woehlke/simpleworklist/testdata/TestDataController.java
+++ b/src/main/java/org/woehlke/simpleworklist/testdata/TestDataController.java
@@ -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/user/account/UserAccount.java b/src/main/java/org/woehlke/simpleworklist/user/account/UserAccount.java
index 33d830f4..cf060724 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccount.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/account/UserAccount.java
@@ -8,9 +8,9 @@
 import lombok.ToString;
 //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/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..947bbc08 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;
@@ -16,7 +15,7 @@
 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.application.language.Language;
 import org.woehlke.simpleworklist.context.ContextRepository;
 import org.woehlke.simpleworklist.user.messages.User2UserMessageRepository;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessage.java b/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessage.java
index 61ec0295..a3f872e2 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessage.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessage.java
@@ -4,7 +4,7 @@
 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.woehlke.simpleworklist.application.common.AuditModel;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 
 import javax.persistence.*;
diff --git a/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessageController.java b/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessageController.java
index a794bd2d..7f063365 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessageController.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessageController.java
@@ -13,7 +13,7 @@
 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.application.common.AbstractController;
 import org.woehlke.simpleworklist.breadcrumb.Breadcrumb;
 import org.woehlke.simpleworklist.session.UserSessionBean;
 import org.woehlke.simpleworklist.context.Context;
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..72a68676 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.config.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..467fb7a4 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.config.ApplicationProperties;
 import org.woehlke.simpleworklist.user.token.TokenGeneratorService;
 
 import java.util.Date;
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 06befed5..d3b035f1 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceController.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceController.java
@@ -16,13 +16,13 @@
 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.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;
 
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 @@
 <configuration>
     <include resource="org/springframework/boot/logging/logback/base.xml"/>
     <logger name="org.woehlke.simpleworklist.application" level="DEBUG" />
-    <logger name="org.woehlke.simpleworklist.config" level="DEBUG" />
+    <logger name="org.woehlke.simpleworklist.application.config" level="DEBUG" />
     <logger name="org.woehlke.simpleworklist.control.admin" level="DEBUG" />
     <logger name="org.woehlke.simpleworklist.control.anonymous" level="DEBUG" />
-    <logger name="org.woehlke.simpleworklist.common" level="DEBUG" />
+    <logger name="org.woehlke.simpleworklist.application.common" level="DEBUG" />
     <logger name="org.woehlke.simpleworklist.control.user" level="DEBUG" />
     <logger name="org.woehlke.simpleworklist.model.beans" level="DEBUG" />
     <logger name="org.woehlke.simpleworklist.model.dao" level="DEBUG" />
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 98%
rename from src/test/java/org/woehlke/simpleworklist/config/AbstractTest.java
rename to src/test/java/org/woehlke/simpleworklist/application/config/AbstractTest.java
index 55f49bb9..55fb4154 100644
--- a/src/test/java/org/woehlke/simpleworklist/config/AbstractTest.java
+++ b/src/test/java/org/woehlke/simpleworklist/application/config/AbstractTest.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.config;
+package org.woehlke.simpleworklist.application.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
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 96%
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..2d6711b2 100644
--- a/src/test/java/org/woehlke/simpleworklist/config/UserAccountTestDataServiceImpl.java
+++ b/src/test/java/org/woehlke/simpleworklist/application/config/UserAccountTestDataServiceImpl.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.config;
+package org.woehlke.simpleworklist.application.config;
 
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -7,7 +7,7 @@
 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/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/testdata/TestDataServiceTest.java b/src/test/java/org/woehlke/simpleworklist/testdata/TestDataServiceTest.java
index f8586813..872c9e96 100644
--- a/src/test/java/org/woehlke/simpleworklist/testdata/TestDataServiceTest.java
+++ b/src/test/java/org/woehlke/simpleworklist/testdata/TestDataServiceTest.java
@@ -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;
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/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/register/UserRegistrationControllerTest.java b/src/test/java/org/woehlke/simpleworklist/user/register/UserRegistrationControllerTest.java
index f540111d..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;
 
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 aa2fe998..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;
 
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 9150394e..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;
 

From ac3a89113f14f9766ac325470e9c4203882a00f2 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 16:37:06 +0200
Subject: [PATCH 27/47] work in progress

---
 etc/serialversions/getserialversionid.cmd                     | 4 ++--
 etc/serialversions/serialversions.txt                         | 4 ++--
 .../{ => application}/breadcrumb/Breadcrumb.java              | 2 +-
 .../{ => application}/breadcrumb/BreadcrumbItem.java          | 3 +--
 .../{ => application}/breadcrumb/BreadcrumbService.java       | 2 +-
 .../{ => application}/breadcrumb/BreadcrumbServiceImpl.java   | 2 +-
 .../application/breadcrumb/BreadcrumbServiceTest.java         | 4 ++++
 .../simpleworklist/application/common/AbstractController.java | 2 +-
 .../org/woehlke/simpleworklist/project/ProjectController.java | 2 +-
 .../woehlke/simpleworklist/project/ProjectControllerRoot.java | 2 +-
 .../simpleworklist/project/ProjectControllerServiceImpl.java  | 4 ++--
 .../org/woehlke/simpleworklist/search/SearchController.java   | 2 +-
 .../simpleworklist/task/TaskStateControllerServiceImpl.java   | 4 ++--
 .../woehlke/simpleworklist/task/TaskStateTaskController.java  | 2 +-
 .../user/messages/User2UserMessageController.java             | 2 +-
 .../user/selfservice/UserSelfserviceController.java           | 2 +-
 .../simpleworklist/breadcrumb/BreadcrumbServiceTest.java      | 4 ----
 17 files changed, 23 insertions(+), 24 deletions(-)
 rename src/main/java/org/woehlke/simpleworklist/{ => application}/breadcrumb/Breadcrumb.java (97%)
 rename src/main/java/org/woehlke/simpleworklist/{ => application}/breadcrumb/BreadcrumbItem.java (87%)
 rename src/main/java/org/woehlke/simpleworklist/{ => application}/breadcrumb/BreadcrumbService.java (96%)
 rename src/main/java/org/woehlke/simpleworklist/{ => application}/breadcrumb/BreadcrumbServiceImpl.java (99%)
 create mode 100644 src/main/java/org/woehlke/simpleworklist/application/breadcrumb/BreadcrumbServiceTest.java
 delete mode 100644 src/test/java/org/woehlke/simpleworklist/breadcrumb/BreadcrumbServiceTest.java

diff --git a/etc/serialversions/getserialversionid.cmd b/etc/serialversions/getserialversionid.cmd
index 3aecc945..695e0eeb 100644
--- a/etc/serialversions/getserialversionid.cmd
+++ b/etc/serialversions/getserialversionid.cmd
@@ -30,8 +30,8 @@ serialver org.woehlke.simpleworklist.user.messages.User2UserMessage  >> ..\..\et
 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
diff --git a/etc/serialversions/serialversions.txt b/etc/serialversions/serialversions.txt
index 5a4859e0..dcee89a1 100644
--- a/etc/serialversions/serialversions.txt
+++ b/etc/serialversions/serialversions.txt
@@ -13,8 +13,8 @@ org.woehlke.simpleworklist.user.messages.User2UserMessage:    private static fin
 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;
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/application/common/AbstractController.java b/src/main/java/org/woehlke/simpleworklist/application/common/AbstractController.java
index c10263c2..d43d8338 100644
--- a/src/main/java/org/woehlke/simpleworklist/application/common/AbstractController.java
+++ b/src/main/java/org/woehlke/simpleworklist/application/common/AbstractController.java
@@ -4,7 +4,7 @@
 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.application.breadcrumb.BreadcrumbService;
 import org.woehlke.simpleworklist.application.config.ApplicationProperties;
 import org.woehlke.simpleworklist.context.Context;
 import org.woehlke.simpleworklist.project.Project;
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
index 7c52bb2a..177641c0 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
+++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
@@ -15,7 +15,7 @@
 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.application.breadcrumb.Breadcrumb;
 import org.woehlke.simpleworklist.session.UserSessionBean;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java
index 54186094..2cfc8f86 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java
+++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java
@@ -12,7 +12,7 @@
 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.application.breadcrumb.Breadcrumb;
 import org.woehlke.simpleworklist.application.common.AbstractController;
 import org.woehlke.simpleworklist.context.Context;
 import org.woehlke.simpleworklist.task.*;
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerServiceImpl.java
index c74ca7cd..9d61bebd 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerServiceImpl.java
@@ -5,8 +5,8 @@
 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.session.UserSessionBean;
 import org.woehlke.simpleworklist.user.account.UserAccount;
diff --git a/src/main/java/org/woehlke/simpleworklist/search/SearchController.java b/src/main/java/org/woehlke/simpleworklist/search/SearchController.java
index 050b3318..74080b4a 100644
--- a/src/main/java/org/woehlke/simpleworklist/search/SearchController.java
+++ b/src/main/java/org/woehlke/simpleworklist/search/SearchController.java
@@ -8,7 +8,7 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.woehlke.simpleworklist.application.common.AbstractController;
-import org.woehlke.simpleworklist.breadcrumb.Breadcrumb;
+import org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb;
 import org.woehlke.simpleworklist.session.UserSessionBean;
 import org.woehlke.simpleworklist.context.Context;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskStateControllerServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/task/TaskStateControllerServiceImpl.java
index 6cf6cfb6..3163f087 100644
--- a/src/main/java/org/woehlke/simpleworklist/task/TaskStateControllerServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/task/TaskStateControllerServiceImpl.java
@@ -6,8 +6,8 @@
 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;
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java b/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java
index 0a716064..78c1d55a 100644
--- a/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java
+++ b/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java
@@ -7,7 +7,7 @@
 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.application.breadcrumb.Breadcrumb;
 import org.woehlke.simpleworklist.application.common.AbstractController;
 import org.woehlke.simpleworklist.context.Context;
 import org.woehlke.simpleworklist.project.Project;
diff --git a/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessageController.java b/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessageController.java
index 7f063365..e93f9b5a 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessageController.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessageController.java
@@ -14,7 +14,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.woehlke.simpleworklist.application.common.AbstractController;
-import org.woehlke.simpleworklist.breadcrumb.Breadcrumb;
+import org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb;
 import org.woehlke.simpleworklist.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/selfservice/UserSelfserviceController.java b/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceController.java
index d3b035f1..563338b4 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceController.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceController.java
@@ -15,7 +15,7 @@
 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.application.breadcrumb.Breadcrumb;
 import org.woehlke.simpleworklist.application.common.AbstractController;
 import org.woehlke.simpleworklist.context.NewContextForm;
 import org.woehlke.simpleworklist.context.UserChangeDefaultContextForm;
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 {
-}

From c0ed5d6972529735be0c1b219581df79a58bf2bc Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 16:52:45 +0200
Subject: [PATCH 28/47] work in progress

---
 etc/serialversions/getserialversionid.cmd     |  6 +++---
 etc/serialversions/serialversions.txt         |  6 +++---
 .../common/AbstractController.java            |  4 ++--
 .../testdata/TestDataController.java          |  2 +-
 .../testdata/TestDataService.java             |  2 +-
 .../testdata/TestDataServiceImpl.java         |  4 +---
 .../testdata/TestDataServiceTest.java         |  2 +-
 .../context/ContextController.java            |  2 +-
 .../project/ProjectController.java            |  2 +-
 .../project/ProjectControllerRoot.java        |  2 +-
 .../project/ProjectControllerService.java     |  2 +-
 .../project/ProjectControllerServiceImpl.java |  2 +-
 .../project/ProjectRepository.java            |  8 --------
 .../project/ProjectServiceImpl.java           |  2 --
 .../search/SearchController.java              |  2 +-
 .../task/TaskStateControllerService.java      |  2 +-
 .../task/TaskStateControllerServiceImpl.java  |  2 +-
 .../task/TaskStateTabController.java          |  2 +-
 .../task/TaskStateTaskController.java         |  2 +-
 .../user/account/UserAccountServiceImpl.java  |  4 ++--
 .../{messages => chat}/User2UserMessage.java  |  2 +-
 .../User2UserMessageController.java           |  4 ++--
 .../User2UserMessageFormBean.java             |  2 +-
 .../User2UserMessageRepository.java           |  3 +--
 .../User2UserMessageService.java              |  2 +-
 .../User2UserMessageServiceImpl.java          |  4 +---
 .../user/login/LoginSuccessHandler.java       |  8 ++++++--
 .../user/login/UserLoginController.java       | 20 ++++++++++++-------
 .../UserSelfserviceController.java            |  2 +-
 .../{ => user}/session/UserSessionBean.java   |  2 +-
 .../testdata/TestDataControllerTest.java      |  4 ----
 .../chat/User2UserMessageControllerTest.java  |  4 ++++
 .../chat/User2UserMessageServiceTest.java     |  4 ++++
 .../User2UserMessageControllerTest.java       |  4 ----
 .../messages/User2UserMessageServiceTest.java |  4 ----
 35 files changed, 60 insertions(+), 69 deletions(-)
 rename src/main/java/org/woehlke/simpleworklist/{ => application}/testdata/TestDataController.java (95%)
 rename src/main/java/org/woehlke/simpleworklist/{ => application}/testdata/TestDataService.java (75%)
 rename src/main/java/org/woehlke/simpleworklist/{ => application}/testdata/TestDataServiceImpl.java (99%)
 rename src/{test/java/org/woehlke/simpleworklist => main/java/org/woehlke/simpleworklist/application}/testdata/TestDataServiceTest.java (96%)
 rename src/main/java/org/woehlke/simpleworklist/user/{messages => chat}/User2UserMessage.java (97%)
 rename src/main/java/org/woehlke/simpleworklist/user/{messages => chat}/User2UserMessageController.java (97%)
 rename src/main/java/org/woehlke/simpleworklist/user/{messages => chat}/User2UserMessageFormBean.java (91%)
 rename src/main/java/org/woehlke/simpleworklist/user/{messages => chat}/User2UserMessageRepository.java (91%)
 rename src/main/java/org/woehlke/simpleworklist/user/{messages => chat}/User2UserMessageService.java (91%)
 rename src/main/java/org/woehlke/simpleworklist/user/{messages => chat}/User2UserMessageServiceImpl.java (96%)
 rename src/main/java/org/woehlke/simpleworklist/{ => user}/session/UserSessionBean.java (95%)
 delete mode 100644 src/test/java/org/woehlke/simpleworklist/testdata/TestDataControllerTest.java
 create mode 100644 src/test/java/org/woehlke/simpleworklist/user/chat/User2UserMessageControllerTest.java
 create mode 100644 src/test/java/org/woehlke/simpleworklist/user/chat/User2UserMessageServiceTest.java
 delete mode 100644 src/test/java/org/woehlke/simpleworklist/user/messages/User2UserMessageControllerTest.java
 delete mode 100644 src/test/java/org/woehlke/simpleworklist/user/messages/User2UserMessageServiceTest.java

diff --git a/etc/serialversions/getserialversionid.cmd b/etc/serialversions/getserialversionid.cmd
index 695e0eeb..6d3bf39b 100644
--- a/etc/serialversions/getserialversionid.cmd
+++ b/etc/serialversions/getserialversionid.cmd
@@ -26,7 +26,7 @@ serialver org.woehlke.simpleworklist.application.common.AuditModel >> ..\..\etc\
 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
@@ -34,7 +34,7 @@ serialver org.woehlke.simpleworklist.application.breadcrumb.BreadcrumbItem  >> .
 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
@@ -43,6 +43,6 @@ serialver org.woehlke.simpleworklist.user.selfservice.UserChangeNameForm >> ..\.
 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 dcee89a1..c0eee59b 100644
--- a/etc/serialversions/serialversions.txt
+++ b/etc/serialversions/serialversions.txt
@@ -9,7 +9,7 @@ org.woehlke.simpleworklist.application.common.AuditModel:    private static fina
 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;
@@ -17,7 +17,7 @@ org.woehlke.simpleworklist.application.breadcrumb.BreadcrumbItem:    private sta
 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;
@@ -25,4 +25,4 @@ org.woehlke.simpleworklist.application.language.UserChangeLanguageForm:    priva
 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/src/main/java/org/woehlke/simpleworklist/application/common/AbstractController.java b/src/main/java/org/woehlke/simpleworklist/application/common/AbstractController.java
index d43d8338..38be25c3 100644
--- a/src/main/java/org/woehlke/simpleworklist/application/common/AbstractController.java
+++ b/src/main/java/org/woehlke/simpleworklist/application/common/AbstractController.java
@@ -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/testdata/TestDataController.java b/src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataController.java
similarity index 95%
rename from src/main/java/org/woehlke/simpleworklist/testdata/TestDataController.java
rename to src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataController.java
index a55e4441..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;
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 99%
rename from src/main/java/org/woehlke/simpleworklist/testdata/TestDataServiceImpl.java
rename to src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataServiceImpl.java
index a63dfa04..5bb9ec35 100644
--- a/src/main/java/org/woehlke/simpleworklist/testdata/TestDataServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataServiceImpl.java
@@ -1,8 +1,6 @@
-package org.woehlke.simpleworklist.testdata;
+package org.woehlke.simpleworklist.application.testdata;
 
 import lombok.extern.slf4j.Slf4j;
-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;
diff --git a/src/test/java/org/woehlke/simpleworklist/testdata/TestDataServiceTest.java b/src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataServiceTest.java
similarity index 96%
rename from src/test/java/org/woehlke/simpleworklist/testdata/TestDataServiceTest.java
rename to src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataServiceTest.java
index 872c9e96..82fef657 100644
--- a/src/test/java/org/woehlke/simpleworklist/testdata/TestDataServiceTest.java
+++ b/src/main/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;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/context/ContextController.java b/src/main/java/org/woehlke/simpleworklist/context/ContextController.java
index 1e4772a4..4a89adb3 100644
--- a/src/main/java/org/woehlke/simpleworklist/context/ContextController.java
+++ b/src/main/java/org/woehlke/simpleworklist/context/ContextController.java
@@ -8,7 +8,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.woehlke.simpleworklist.application.common.AbstractController;
-import org.woehlke.simpleworklist.session.UserSessionBean;
+import org.woehlke.simpleworklist.user.session.UserSessionBean;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
index 177641c0..8e353af4 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
+++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
@@ -16,7 +16,7 @@
 import org.woehlke.simpleworklist.task.*;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 import org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb;
-import org.woehlke.simpleworklist.session.UserSessionBean;
+import org.woehlke.simpleworklist.user.session.UserSessionBean;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import javax.validation.Valid;
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java
index 2cfc8f86..aad6f4f0 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java
+++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java
@@ -16,7 +16,7 @@
 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;
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerService.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerService.java
index f319f77a..c13aaad2 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerService.java
+++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerService.java
@@ -3,7 +3,7 @@
 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;
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerServiceImpl.java
index 9d61bebd..018f2d17 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerServiceImpl.java
@@ -8,7 +8,7 @@
 import org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb;
 import org.woehlke.simpleworklist.application.breadcrumb.BreadcrumbService;
 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 javax.validation.constraints.Min;
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<Project, Long> {
 
-    List<Project> findByParentIsNull();
-
-    //@Deprecated
-    //List<Project> findByParentIsNullAndUserAccount(UserAccount userAccount);
-
-    //@Deprecated
-    //List<Project> findByUserAccount(UserAccount userAccount);
-
     List<Project> findByContext(Context context);
 
     List<Project> 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 3cbf4e9a..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;
diff --git a/src/main/java/org/woehlke/simpleworklist/search/SearchController.java b/src/main/java/org/woehlke/simpleworklist/search/SearchController.java
index 74080b4a..1b82d821 100644
--- a/src/main/java/org/woehlke/simpleworklist/search/SearchController.java
+++ b/src/main/java/org/woehlke/simpleworklist/search/SearchController.java
@@ -9,7 +9,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.woehlke.simpleworklist.application.common.AbstractController;
 import org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb;
-import org.woehlke.simpleworklist.session.UserSessionBean;
+import org.woehlke.simpleworklist.user.session.UserSessionBean;
 import org.woehlke.simpleworklist.context.Context;
 
 import org.springframework.beans.factory.annotation.Autowired;
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 3163f087..deef5452 100644
--- a/src/main/java/org/woehlke/simpleworklist/task/TaskStateControllerServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/task/TaskStateControllerServiceImpl.java
@@ -11,7 +11,7 @@
 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;
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskStateTabController.java b/src/main/java/org/woehlke/simpleworklist/task/TaskStateTabController.java
index a85836d2..b455adc7 100644
--- a/src/main/java/org/woehlke/simpleworklist/task/TaskStateTabController.java
+++ b/src/main/java/org/woehlke/simpleworklist/task/TaskStateTabController.java
@@ -12,7 +12,7 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 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 78c1d55a..5fe57d87 100644
--- a/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java
+++ b/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java
@@ -11,7 +11,7 @@
 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;
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 947bbc08..3b775d4b 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountServiceImpl.java
@@ -14,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.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 97%
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 a3f872e2..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,4 +1,4 @@
-package org.woehlke.simpleworklist.user.messages;
+package org.woehlke.simpleworklist.user.chat;
 
 import lombok.*;
 import org.hibernate.validator.constraints.Length;
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 97%
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 e93f9b5a..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;
@@ -15,7 +15,7 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.woehlke.simpleworklist.application.common.AbstractController;
 import org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb;
-import org.woehlke.simpleworklist.session.UserSessionBean;
+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 91%
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 059b1d0a..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,4 +1,4 @@
-package org.woehlke.simpleworklist.user.messages;
+package org.woehlke.simpleworklist.user.chat;
 
 
 import lombok.*;
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/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/selfservice/UserSelfserviceController.java b/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceController.java
index 563338b4..c6039be6 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceController.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceController.java
@@ -24,7 +24,7 @@
 import org.woehlke.simpleworklist.user.account.UserAccount;
 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;
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/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/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/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 {
-}

From 23106d807de3cbfae3e8664b64d6806abcb66a2b Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 17:00:21 +0200
Subject: [PATCH 29/47] work in progress

---
 .../woehlke/simpleworklist/SimpleworklistApplication.java   | 6 +++---
 .../application/{config => }/ApplicationProperties.java     | 2 +-
 .../application/common/AbstractController.java              | 2 +-
 .../application/config/{di => }/WebMvcConfig.java           | 4 ++--
 .../application/config/{di => }/WebSecurityConfig.java      | 5 +++--
 .../{config => }/listener/ContextRefreshedListener.java     | 2 +-
 .../{config => }/listener/ContextStartedListener.java       | 2 +-
 .../user/register/UserRegistrationServiceImpl.java          | 2 +-
 .../user/resetpassword/UserPasswordRecoveryServiceImpl.java | 2 +-
 .../simpleworklist/application/config/AbstractTest.java     | 1 +
 .../application/config/UserAccountTestDataServiceImpl.java  | 1 +
 .../application/testdata/TestDataServiceTest.java           | 2 +-
 12 files changed, 17 insertions(+), 14 deletions(-)
 rename src/main/java/org/woehlke/simpleworklist/application/{config => }/ApplicationProperties.java (97%)
 rename src/main/java/org/woehlke/simpleworklist/application/config/{di => }/WebMvcConfig.java (97%)
 rename src/main/java/org/woehlke/simpleworklist/application/config/{di => }/WebSecurityConfig.java (96%)
 rename src/main/java/org/woehlke/simpleworklist/application/{config => }/listener/ContextRefreshedListener.java (94%)
 rename src/main/java/org/woehlke/simpleworklist/application/{config => }/listener/ContextStartedListener.java (94%)
 rename src/{main => test}/java/org/woehlke/simpleworklist/application/testdata/TestDataServiceTest.java (95%)

diff --git a/src/main/java/org/woehlke/simpleworklist/SimpleworklistApplication.java b/src/main/java/org/woehlke/simpleworklist/SimpleworklistApplication.java
index d1376b9a..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.application.config.ApplicationProperties;
-import org.woehlke.simpleworklist.application.config.di.WebMvcConfig;
-import org.woehlke.simpleworklist.application.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/application/config/ApplicationProperties.java b/src/main/java/org/woehlke/simpleworklist/application/ApplicationProperties.java
similarity index 97%
rename from src/main/java/org/woehlke/simpleworklist/application/config/ApplicationProperties.java
rename to src/main/java/org/woehlke/simpleworklist/application/ApplicationProperties.java
index de7c5401..fecead3c 100644
--- a/src/main/java/org/woehlke/simpleworklist/application/config/ApplicationProperties.java
+++ b/src/main/java/org/woehlke/simpleworklist/application/ApplicationProperties.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.config;
+package org.woehlke.simpleworklist.application;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/org/woehlke/simpleworklist/application/common/AbstractController.java b/src/main/java/org/woehlke/simpleworklist/application/common/AbstractController.java
index 38be25c3..d92da238 100644
--- a/src/main/java/org/woehlke/simpleworklist/application/common/AbstractController.java
+++ b/src/main/java/org/woehlke/simpleworklist/application/common/AbstractController.java
@@ -5,7 +5,7 @@
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.SessionAttributes;
 import org.woehlke.simpleworklist.application.breadcrumb.BreadcrumbService;
-import org.woehlke.simpleworklist.application.config.ApplicationProperties;
+import org.woehlke.simpleworklist.application.ApplicationProperties;
 import org.woehlke.simpleworklist.context.Context;
 import org.woehlke.simpleworklist.project.Project;
 import org.woehlke.simpleworklist.task.TaskService;
diff --git a/src/main/java/org/woehlke/simpleworklist/application/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/application/config/di/WebMvcConfig.java
rename to src/main/java/org/woehlke/simpleworklist/application/config/WebMvcConfig.java
index 9936e21d..a9b128b1 100644
--- a/src/main/java/org/woehlke/simpleworklist/application/config/di/WebMvcConfig.java
+++ b/src/main/java/org/woehlke/simpleworklist/application/config/WebMvcConfig.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.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.application.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/application/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/application/config/di/WebSecurityConfig.java
rename to src/main/java/org/woehlke/simpleworklist/application/config/WebSecurityConfig.java
index 8a54030e..e4bba3e2 100644
--- a/src/main/java/org/woehlke/simpleworklist/application/config/di/WebSecurityConfig.java
+++ b/src/main/java/org/woehlke/simpleworklist/application/config/WebSecurityConfig.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.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.application.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/application/config/listener/ContextRefreshedListener.java b/src/main/java/org/woehlke/simpleworklist/application/listener/ContextRefreshedListener.java
similarity index 94%
rename from src/main/java/org/woehlke/simpleworklist/application/config/listener/ContextRefreshedListener.java
rename to src/main/java/org/woehlke/simpleworklist/application/listener/ContextRefreshedListener.java
index 0e520492..d0489db4 100644
--- a/src/main/java/org/woehlke/simpleworklist/application/config/listener/ContextRefreshedListener.java
+++ b/src/main/java/org/woehlke/simpleworklist/application/listener/ContextRefreshedListener.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.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/application/config/listener/ContextStartedListener.java b/src/main/java/org/woehlke/simpleworklist/application/listener/ContextStartedListener.java
similarity index 94%
rename from src/main/java/org/woehlke/simpleworklist/application/config/listener/ContextStartedListener.java
rename to src/main/java/org/woehlke/simpleworklist/application/listener/ContextStartedListener.java
index ccbaae08..ab6743a6 100644
--- a/src/main/java/org/woehlke/simpleworklist/application/config/listener/ContextStartedListener.java
+++ b/src/main/java/org/woehlke/simpleworklist/application/listener/ContextStartedListener.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.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/user/register/UserRegistrationServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationServiceImpl.java
index 72a68676..863b46ca 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationServiceImpl.java
@@ -13,7 +13,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import org.woehlke.simpleworklist.application.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/UserPasswordRecoveryServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryServiceImpl.java
index 467fb7a4..a8a38964 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryServiceImpl.java
@@ -9,7 +9,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import org.woehlke.simpleworklist.application.config.ApplicationProperties;
+import org.woehlke.simpleworklist.application.ApplicationProperties;
 import org.woehlke.simpleworklist.user.token.TokenGeneratorService;
 
 import java.util.Date;
diff --git a/src/test/java/org/woehlke/simpleworklist/application/config/AbstractTest.java b/src/test/java/org/woehlke/simpleworklist/application/config/AbstractTest.java
index 55fb4154..7e8c8af8 100644
--- a/src/test/java/org/woehlke/simpleworklist/application/config/AbstractTest.java
+++ b/src/test/java/org/woehlke/simpleworklist/application/config/AbstractTest.java
@@ -7,6 +7,7 @@
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.context.WebApplicationContext;
+import org.woehlke.simpleworklist.application.ApplicationProperties;
 import org.woehlke.simpleworklist.helper.TestHelperService;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 import org.woehlke.simpleworklist.user.account.UserAccountService;
diff --git a/src/test/java/org/woehlke/simpleworklist/application/config/UserAccountTestDataServiceImpl.java b/src/test/java/org/woehlke/simpleworklist/application/config/UserAccountTestDataServiceImpl.java
index 2d6711b2..32011b1c 100644
--- a/src/test/java/org/woehlke/simpleworklist/application/config/UserAccountTestDataServiceImpl.java
+++ b/src/test/java/org/woehlke/simpleworklist/application/config/UserAccountTestDataServiceImpl.java
@@ -4,6 +4,7 @@
 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;
diff --git a/src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataServiceTest.java b/src/test/java/org/woehlke/simpleworklist/application/testdata/TestDataServiceTest.java
similarity index 95%
rename from src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataServiceTest.java
rename to src/test/java/org/woehlke/simpleworklist/application/testdata/TestDataServiceTest.java
index 82fef657..52993e6d 100644
--- a/src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataServiceTest.java
+++ b/src/test/java/org/woehlke/simpleworklist/application/testdata/TestDataServiceTest.java
@@ -53,6 +53,6 @@ public void createTestCategoryTreeForUserAccountTest(){
         userAccountTestDataService.setUp();
         UserAccount userAccount = userAccountTestDataService.getFirstUserAccount();
         //TODO: #128
-        //testDataService.createTestCategoryTreeForUserAccount(userAccount);
+        testDataService.createTestCategoryTreeForUserAccount(userAccount);
     }
 }

From 3e126b6d7dc2524032129f0be99486d908e3a20b Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 17:03:03 +0200
Subject: [PATCH 30/47] work in progress

---
 .../simpleworklist/application/config/AbstractTest.java        | 2 +-
 .../{ => application}/helper/TestHelperService.java            | 2 +-
 .../{ => application}/helper/TestHelperServiceImpl.java        | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)
 rename src/test/java/org/woehlke/simpleworklist/{ => application}/helper/TestHelperService.java (91%)
 rename src/test/java/org/woehlke/simpleworklist/{ => application}/helper/TestHelperServiceImpl.java (96%)

diff --git a/src/test/java/org/woehlke/simpleworklist/application/config/AbstractTest.java b/src/test/java/org/woehlke/simpleworklist/application/config/AbstractTest.java
index 7e8c8af8..e3cea01e 100644
--- a/src/test/java/org/woehlke/simpleworklist/application/config/AbstractTest.java
+++ b/src/test/java/org/woehlke/simpleworklist/application/config/AbstractTest.java
@@ -8,7 +8,7 @@
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.context.WebApplicationContext;
 import org.woehlke.simpleworklist.application.ApplicationProperties;
-import org.woehlke.simpleworklist.helper.TestHelperService;
+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;
diff --git a/src/test/java/org/woehlke/simpleworklist/helper/TestHelperService.java b/src/test/java/org/woehlke/simpleworklist/application/helper/TestHelperService.java
similarity index 91%
rename from src/test/java/org/woehlke/simpleworklist/helper/TestHelperService.java
rename to src/test/java/org/woehlke/simpleworklist/application/helper/TestHelperService.java
index acce6df5..e3ebf9cf 100644
--- a/src/test/java/org/woehlke/simpleworklist/helper/TestHelperService.java
+++ b/src/test/java/org/woehlke/simpleworklist/application/helper/TestHelperService.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.helper;
+package org.woehlke.simpleworklist.application.helper;
 
 import org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecovery;
 import org.woehlke.simpleworklist.user.register.UserRegistration;
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 96%
rename from src/test/java/org/woehlke/simpleworklist/helper/TestHelperServiceImpl.java
rename to src/test/java/org/woehlke/simpleworklist/application/helper/TestHelperServiceImpl.java
index c2d3e7f3..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,7 +8,6 @@
 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;

From f0cb51cde8ad23fdc1c5f61d6fff46f98e18168b Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 17:08:15 +0200
Subject: [PATCH 31/47] work in progress

---
 src/main/resources/templates/user/login/loginForm.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/templates/user/login/loginForm.html b/src/main/resources/templates/user/login/loginForm.html
index 5ffd3542..6c8f718b 100644
--- a/src/main/resources/templates/user/login/loginForm.html
+++ b/src/main/resources/templates/user/login/loginForm.html
@@ -48,21 +48,23 @@ <h2><span th:utext="#{user.loginForm.h2}">Your Todo-List for Getting Things Done
                             </div>
                         </div>
                     </div>
+                </div>
+                <div class="card-footer">
                     <div class="form-row">
-                        <div class="col-md-4 mb-4">
+                        <div class="col-md-3 mb-3">
                             <button id="loginButton" type="submit" class="btn btn-block btn-primary">
                                 <i class="fas fa-sign-in-alt"></i>
                                 <span th:utext="#{user.loginForm.loginButton}"></span>
                             </button>
                         </div>
-                        <div class="col-md-4 mb-4">
+                        <div class="col-md-3 mb-3">
                             <a id="passwordResetButton" th:href="@{/user/resetPassword}" role="button"
                                class="btn btn-block btn-secondary">
                                 <i class="fas fa-question-circle"></i>
                                 <span th:utext="#{user.loginForm.passwordReset}">Password forgotten?</span>
                             </a>
                         </div>
-                        <div class="col-md-4 mb-4">
+                        <div class="col-md-3 mb-3">
                             <a id="registerButton" th:href="@{/user/register}" role="button"
                                class="btn btn-block btn-secondary">
                                 <i class="fas fa-user"></i>

From 4ad68ebe5d6f632295e7a61a95ee82e5037fa134 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 17:12:47 +0200
Subject: [PATCH 32/47] work in progress

---
 .../templates/user/login/loginForm.html       | 42 +++++++++----------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/main/resources/templates/user/login/loginForm.html b/src/main/resources/templates/user/login/loginForm.html
index 6c8f718b..6682666d 100644
--- a/src/main/resources/templates/user/login/loginForm.html
+++ b/src/main/resources/templates/user/login/loginForm.html
@@ -49,28 +49,26 @@ <h2><span th:utext="#{user.loginForm.h2}">Your Todo-List for Getting Things Done
                         </div>
                     </div>
                 </div>
-                <div class="card-footer">
-                    <div class="form-row">
-                        <div class="col-md-3 mb-3">
-                            <button id="loginButton" type="submit" class="btn btn-block btn-primary">
-                                <i class="fas fa-sign-in-alt"></i>
-                                <span th:utext="#{user.loginForm.loginButton}"></span>
-                            </button>
-                        </div>
-                        <div class="col-md-3 mb-3">
-                            <a id="passwordResetButton" th:href="@{/user/resetPassword}" role="button"
-                               class="btn btn-block btn-secondary">
-                                <i class="fas fa-question-circle"></i>
-                                <span th:utext="#{user.loginForm.passwordReset}">Password forgotten?</span>
-                            </a>
-                        </div>
-                        <div class="col-md-3 mb-3">
-                            <a id="registerButton" th:href="@{/user/register}" role="button"
-                               class="btn btn-block btn-secondary">
-                                <i class="fas fa-user"></i>
-                                <span th:utext="#{user.loginForm.register}">register as new user</span>
-                            </a>
-                        </div>
+                <div class="card-footer form-row">
+                    <div class="col-md-4 mb-4">
+                        <button id="loginButton" type="submit" class="btn btn-block btn-primary">
+                            <i class="fas fa-sign-in-alt"></i>
+                            <span th:utext="#{user.loginForm.loginButton}"></span>
+                        </button>
+                    </div>
+                    <div class="col-md-4 mb-4">
+                        <a id="passwordResetButton" th:href="@{/user/resetPassword}" role="button"
+                           class="btn btn-block btn-secondary">
+                            <i class="fas fa-question-circle"></i>
+                            <span th:utext="#{user.loginForm.passwordReset}">Password forgotten?</span>
+                        </a>
+                    </div>
+                    <div class="col-md-4 mb-4">
+                        <a id="registerButton" th:href="@{/user/register}" role="button"
+                           class="btn btn-block btn-secondary">
+                            <i class="fas fa-user"></i>
+                            <span th:utext="#{user.loginForm.register}">register as new user</span>
+                        </a>
                     </div>
 				</div>
 			</div>

From d2d6a5975d7a91b11c8e4cb42bdda947f271a125 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 18:44:34 +0200
Subject: [PATCH 33/47] work in progress

---
 .../project/ProjectController.java            |   1 +
 .../task/TaskStateTaskController.java         |   1 +
 .../resources/templates/layout/taskadd.html   | 128 ++++++++++++++++++
 .../templates/taskstate/task/add.html         |  98 ++------------
 4 files changed, 142 insertions(+), 86 deletions(-)
 create mode 100644 src/main/resources/templates/layout/taskadd.html

diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
index 8e353af4..b667134d 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
+++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
@@ -54,6 +54,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;
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java b/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java
index 5fe57d87..7d1bd488 100644
--- a/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java
+++ b/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java
@@ -52,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;
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 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
+      xmlns:sd="http://www.thymeleaf.org/spring-data">
+
+    <div th:fragment="tw-task-add-form(task,listTaskState,listTaskEnergy,listTaskTime,contexts)">
+        <input type="hidden" th:field="*{id}" />
+        <input type="hidden" th:field="*{uuid}" />
+        <input type="hidden" th:field="*{focus}" />
+        <input type="hidden" th:field="*{rowCreatedAt.time}" />
+        <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
+        <div class="form-row">
+            <div class="col-md-12 mb-12">
+                <div class="form-group">
+                    <label th:for="${#ids.next('title')}" class="control-label">
+                        <span th:utext="#{task.show.title}">Title</span>
+                    </label>
+                    <input type="text" th:field="*{title}" class="form-control form-control-lg is-invalid" required/>
+                    <div th:each="err : ${#fields.errors('title')}">
+                        <div class="invalid-feedback" th:text="${err}" >err</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="form-row">
+            <div class="col-md-6 mb-6">
+                <div class="form-group">
+                    <label th:for="${#ids.next('listTaskState')}" class="control-label">
+                        <span th:utext="#{tasks.col.taskState}">taskState</span>
+                    </label>
+                    <select th:field="*{taskState}" class="form-control form-control-lg is-invalid" required>
+                        <option th:each="taskStateItem : ${listTaskState}"
+                                th:value="${taskStateItem.value}"
+                                th:text="${#messages.msgOrNull(taskStateItem.code)}">
+                            taskStateItem
+                        </option>
+                    </select>
+                    <div th:each="err : ${#fields.errors('taskState')}">
+                        <div class="invalid-feedback" th:text="${err}" >err</div>
+                    </div>
+                </div>
+            </div>
+            <div class="col-md-6 mb-6">
+                <div class="form-group">
+                    <label for="taskDueDate" class="control-label">
+                        <span th:utext="#{task.show.dueDate}">dueDate</span>
+                    </label>
+                    <input id="taskDueDate" type="text" th:field="*{dueDate}"
+                           class="form-control form-control-lg is-invalid"/>
+                    <div th:each="err : ${#fields.errors('dueDate')}">
+                        <div class="invalid-feedback" th:text="${err}" >err</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="form-row">
+            <div class="col-md-12 mb-12">
+                <div class="form-group">
+                    <label th:for="textEditor" class="control-label">
+                        <span th:utext="#{task.show.text}">Text</span>
+                    </label>
+                    <textarea id="textEditor" name="textEditor" rows="10" cols="50"
+                              class="form-control form-control-lg is-invalid"
+                              th:field="*{text}">Text
+                    </textarea>
+                    <div th:each="err : ${#fields.errors('text')}">
+                        <div class="invalid-feedback" th:text="${err}" >err</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="form-row">
+            <div class="col-md-4 mb-4">
+                <div class="form-group">
+                    <label th:for="${#ids.next('taskEnergy')}" class="control-label">
+                        <span th:utext="#{task.show.taskEnergy}">taskEnergy</span>
+                    </label>
+                    <select th:field="*{taskEnergy}" class="form-control form-control-lg is-invalid">
+                        <option th:each="taskEnergyItem : ${listTaskEnergy}"
+                                th:value="${taskEnergyItem.value}"
+                                th:text="${#messages.msgOrNull(taskEnergyItem.code)}">
+                            taskEnergyItem
+                        </option>
+                    </select>
+                    <div th:each="err : ${#fields.errors('taskEnergy')}">
+                        <div class="invalid-feedback" th:text="${err}" >err</div>
+                    </div>
+                </div>
+            </div>
+            <div class="col-md-4 mb-4">
+                <div class="form-group">
+                    <label th:for="${#ids.next('taskTime')}" class="control-label">
+                        <span th:utext="#{task.show.taskTime}">Time</span>
+                    </label>
+                    <select th:field="*{taskTime}" class="form-control form-control-lg is-invalid">
+                        <option th:each="taskTimeItem : ${listTaskTime}"
+                                th:value="${taskTimeItem.value}"
+                                th:text="${#messages.msgOrNull(taskTimeItem.code)}">
+                            taskTimeItem
+                        </option>
+                    </select>
+                    <div th:each="err : ${#fields.errors('taskEnergy')}">
+                        <div class="invalid-feedback" th:text="${err}" >err</div>
+                    </div>
+                </div>&nbsp;
+            </div>
+            <div class="col-md-4 mb-4">
+                <div class="form-group">
+                    <label th:for="${#ids.next('context.id')}" class="control-label">
+                        <span th:utext="#{task.show.context}">Context</span>
+                    </label>
+                    <select th:field="*{context.id}" class="form-control form-control-lg is-invalid">
+                        <option th:each="contextOption : ${contexts}"
+                                th:value="${contextOption.id}"
+                                th:text="${locale == 'de' ? contextOption.nameDe : contextOption.nameEn}">
+                            contextOption
+                        </option>
+                    </select>
+                    <div th:each="err : ${#fields.errors('context.id')}">
+                        <div class="invalid-feedback" th:text="${err}" >err</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+</html>
diff --git a/src/main/resources/templates/taskstate/task/add.html b/src/main/resources/templates/taskstate/task/add.html
index a0eb94dc..34c099fb 100644
--- a/src/main/resources/templates/taskstate/task/add.html
+++ b/src/main/resources/templates/taskstate/task/add.html
@@ -7,7 +7,7 @@
 <head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
 	<title th:text="'SimpleWorklist | ' + #{task.add.h1}">Title</title>
 </head>
-<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},,scripts=~{::script})">
+<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{::script})">
 
 <div th:fragment="mytwtitle">
 	<!-- New Task Form -->
@@ -18,91 +18,17 @@ <h1>
 </div>
 
 <div th:fragment="mytwcontent">
-	<form id="formId" th:action="@{/taskstate/task/add}" th:object="${task}" method="post">
-		<input type="hidden" th:field="*{taskState}" />
-		<input type="hidden" th:field="*{context.id}" />
-		<input type="hidden" th:field="*{rowCreatedAt.time}" />
-		<div class="form-group form-control-lg">
-			<label th:for="${#ids.next('title')}" class="control-label">
-				<span th:utext="#{task.show.title}">Title</span>
-			</label>
-			<input type="text" th:field="*{title}" class="form-control" />
-			<div>
-				<div th:each="err : ${#fields.errors('title')}" th:text="${err}" class="alert alert-danger" >
-				</div>
-			</div>
-		</div>
-		<div class="form-group form-control-lg">
-			<label for="taskDueDate" class="control-label">
-				<span th:utext="#{task.show.dueDate}">Due Date</span>
-			</label>
-			<input id="taskDueDate" type="text" th:field="*{dueDate}" class="form-control" />
-			<div>
-				<div th:each="err : ${#fields.errors('dueDate')}" th:text="${err}" class="alert alert-danger">
-				</div>
-			</div>
-		</div>
-		<div class="form-group form-control-lg">
-			<label th:for="textEditor" class="control-label">
-				<span th:utext="#{task.show.text}">Text</span>
-			</label>
-			<textarea id="textEditor" name="textEditor" rows="10" cols="50" th:field="*{text}" class="form-control" ></textarea>
-			<div>
-				<div th:each="err : ${#fields.errors('text')}" th:text="${err}" class="alert alert-danger">
-				</div>
-			</div>
-		</div>
-		<div>
-			<span class="form-group form-control-lg">
-				<label th:for="${#ids.next('taskEnergy')}" class="control-label">
-					<span th:utext="#{task.show.taskEnergy}">Energy</span>
-				</label>
-				<select th:field="*{taskEnergy}">
-					<option th:each="taskEnergyItem : ${listTaskEnergy}"
-							th:value="${taskEnergyItem.value}"
-							th:text="${#messages.msgOrNull(taskEnergyItem.code)}">Wireframe</option>
-				</select>
-				<div>
-					<div th:each="err : ${#fields.errors('taskEnergy')}" th:text="${err}" class="alert alert-danger">
-					</div>
-				</div>
-			</span>&nbsp;
-			<span class="form-group form-control-lg">
-				<label th:for="${#ids.next('taskTime')}" class="control-label">
-					<span th:utext="#{task.show.taskTime}">Time</span>
-				</label>
-				<select th:field="*{taskTime}">
-					<option th:each="taskTimeItem : ${listTaskTime}"
-							th:value="${taskTimeItem.value}"
-							th:text="${#messages.msgOrNull(taskTimeItem.code)}">Wireframe</option>
-				</select>
-				<div>
-					<div th:each="err : ${#fields.errors('taskTime')}" th:text="${err}" class="alert alert-danger">
-					</div>
-				</div>
-			</span>&nbsp;
-			<span class="form-group form-control-lg">
-				<label th:for="${#ids.next('context.id')}" class="control-label">
-					<span th:utext="#{task.show.context}">Area</span>
-				</label>
-				<select th:field="*{context.id}">
-					<option th:each="areaOption : ${contexts}"
-							th:value="${areaOption.id}"
-							th:text="${locale == 'de' ? areaOption.nameDe : areaOption.nameEn}">Wireframe</option>
-				</select>
-				<div>
-					<div th:each="err : ${#fields.errors('context.id')}" th:text="${err}" class="alert alert-danger">
-					</div>
-				</div>
-			</span>
-		</div>
-        <input type="hidden"
-               name="${_csrf.parameterName}"
-               value="${_csrf.token}"/>
-		<button id="createNewTask" type="submit" class="btn btn-primary">
-			<i class="fas fa-save"></i>
-			<span th:utext="#{task.add.button}">Add Task</span>
-		</button>
+	<form id="formId" class="was-validated"
+          th:action="@{/taskstate/task/add}" th:object="${task}" method="post">
+        <div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
+        <div class="form-row">
+            <div class="col-md-12 mb-12">
+                <button id="createNewTask" type="submit" class="btn btn-block btn-primary">
+                    <i class="fas fa-save"></i>
+                    <span th:utext="#{task.add.button}">Add Task</span>
+                </button>
+            </div>
+        </div>
 	</form>
 </div>
 

From 96b8458f438f20c0827aef36d76a904ad11022e9 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 18:58:52 +0200
Subject: [PATCH 34/47] work in progress

---
 .../templates/project/id/task/add.html        | 96 ++----------------
 .../templates/project/root/task/add.html      | 97 +++----------------
 2 files changed, 21 insertions(+), 172 deletions(-)

diff --git a/src/main/resources/templates/project/id/task/add.html b/src/main/resources/templates/project/id/task/add.html
index 99c0bcc4..4abb6868 100644
--- a/src/main/resources/templates/project/id/task/add.html
+++ b/src/main/resources/templates/project/id/task/add.html
@@ -18,93 +18,17 @@ <h1>
 </div>
 
 <div th:fragment="mytwcontent">
-	<form id="formId" method="post"
+	<form id="formId" class="was-validated" method="post"
           th:action="@{/project/{projectId}/task/add(projectId=${thisProject.id})}" th:object="${task}">
-		<input type="hidden" th:field="*{taskState}" />
-		<input type="hidden" th:field="*{context.id}" />
-		<input type="hidden" th:field="*{rowCreatedAt.time}" />
-		<div class="form-group form-control-lg">
-			<label th:for="${#ids.next('title')}" class="control-label">
-				<span th:utext="#{task.show.title}">Title</span>
-			</label>
-			<input type="text" th:field="*{title}" class="form-control" />
-			<div>
-				<div th:each="err : ${#fields.errors('title')}" th:text="${err}" class="alert alert-danger" >
-				</div>
-			</div>
-		</div>
-		<div class="form-group form-control-lg">
-			<label for="taskDueDate" class="control-label">
-				<span th:utext="#{task.show.dueDate}">Due Date</span>
-			</label>
-			<input id="taskDueDate" type="text" th:field="*{dueDate}" class="form-control" />
-			<div>
-				<div th:each="err : ${#fields.errors('dueDate')}" th:text="${err}" class="alert alert-danger">
-				</div>
-			</div>
-		</div>
-		<div class="form-group form-control-lg">
-			<label th:for="textEditor" class="control-label">
-				<span th:utext="#{task.show.text}">Text</span>
-			</label>
-			<textarea id="textEditor" name="textEditor" rows="10" cols="50" class="form-control"
-                      th:field="*{text}" >Text</textarea>
-			<div>
-				<div th:each="err : ${#fields.errors('text')}" th:text="${err}" class="alert alert-danger">
-				</div>
-			</div>
-		</div>
-		<div>
-			<span class="form-group form-control-lg">
-				<label th:for="${#ids.next('taskEnergy')}" class="control-label">
-					<span th:utext="#{task.show.taskEnergy}">Energy</span>
-				</label>
-				<select th:field="*{taskEnergy}">
-					<option th:each="taskEnergyItem : ${listTaskEnergy}"
-							th:value="${taskEnergyItem.value}"
-							th:text="${#messages.msgOrNull(taskEnergyItem.code)}">Wireframe</option>
-				</select>
-				<div>
-					<div th:each="err : ${#fields.errors('taskEnergy')}" th:text="${err}" class="alert alert-danger">
-					</div>
-				</div>
-			</span>&nbsp;
-			<span class="form-group form-control-lg">
-				<label th:for="${#ids.next('taskTime')}" class="control-label">
-					<span th:utext="#{task.show.taskTime}">Time</span>
-				</label>
-				<select th:field="*{taskTime}">
-					<option th:each="taskTimeItem : ${listTaskTime}"
-							th:value="${taskTimeItem.value}"
-							th:text="${#messages.msgOrNull(taskTimeItem.code)}">Wireframe</option>
-				</select>
-				<div>
-					<div th:each="err : ${#fields.errors('taskTime')}" th:text="${err}" class="alert alert-danger">
-					</div>
-				</div>
-			</span>&nbsp;
-			<span class="form-group form-control-lg">
-				<label th:for="${#ids.next('context.id')}" class="control-label">
-					<span th:utext="#{task.show.context}">Area</span>
-				</label>
-				<select th:field="*{context.id}">
-					<option th:each="areaOption : ${contexts}"
-							th:value="${areaOption.id}"
-							th:text="${locale == 'de' ? areaOption.nameDe : areaOption.nameEn}">Wireframe</option>
-				</select>
-				<div>
-					<div th:each="err : ${#fields.errors('context.id')}" th:text="${err}" class="alert alert-danger">
-					</div>
-				</div>
-			</span>
-		</div>
-        <input type="hidden"
-               name="${_csrf.parameterName}"
-               value="${_csrf.token}"/>
-		<button id="createNewTask" type="submit" class="btn btn-primary">
-			<i class="fas fa-save"></i>
-			<span th:utext="#{task.add.button}">Add Task</span>
-		</button>
+        <div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
+        <div class="form-row">
+            <div class="col-md-12 mb-12">
+                <button id="createNewTask" type="submit" class="btn btn-block btn-primary">
+                    <i class="fas fa-save"></i>
+                    <span th:utext="#{task.add.button}">Add Task</span>
+                </button>
+            </div>
+        </div>
 	</form>
 </div>
 
diff --git a/src/main/resources/templates/project/root/task/add.html b/src/main/resources/templates/project/root/task/add.html
index 623ea884..f33b5734 100644
--- a/src/main/resources/templates/project/root/task/add.html
+++ b/src/main/resources/templates/project/root/task/add.html
@@ -18,92 +18,17 @@ <h1>
 </div>
 
 <div th:fragment="mytwcontent">
-	<form id="formId" th:action="@{/project/root/task/add/}" th:object="${task}" method="post">
-		<input type="hidden" th:field="*{taskState}" />
-		<input type="hidden" th:field="*{context.id}" />
-		<input type="hidden" th:field="*{rowCreatedAt.time}" />
-		<div class="form-group form-control-lg">
-			<label th:for="${#ids.next('title')}" class="control-label">
-				<span th:utext="#{task.show.title}">Title</span>
-			</label>
-			<input type="text" th:field="*{title}" class="form-control" />
-			<div>
-				<div th:each="err : ${#fields.errors('title')}" th:text="${err}" class="alert alert-danger" >
-				</div>
-			</div>
-		</div>
-		<div class="form-group form-control-lg">
-			<label for="taskDueDate" class="control-label">
-				<span th:utext="#{task.show.dueDate}">Due Date</span>
-			</label>
-			<input id="taskDueDate" type="text" th:field="*{dueDate}" class="form-control" />
-			<div>
-				<div th:each="err : ${#fields.errors('dueDate')}" th:text="${err}" class="alert alert-danger">
-				</div>
-			</div>
-		</div>
-		<div class="form-group form-control-lg">
-			<label th:for="textEditor" class="control-label">
-				<span th:utext="#{task.show.text}">Text</span>
-			</label>
-			<textarea id="textEditor" name="textEditor" rows="10" cols="50" class="form-control"
-                      th:field="*{text}" ></textarea>
-			<div>
-				<div th:each="err : ${#fields.errors('text')}" th:text="${err}" class="alert alert-danger">
-				</div>
-			</div>
-		</div>
-		<div>
-			<span class="form-group form-control-lg">
-				<label th:for="${#ids.next('taskEnergy')}" class="control-label">
-					<span th:utext="#{task.show.taskEnergy}">Energy</span>
-				</label>
-				<select th:field="*{taskEnergy}">
-					<option th:each="taskEnergyItem : ${listTaskEnergy}"
-							th:value="${taskEnergyItem.value}"
-							th:text="${#messages.msgOrNull(taskEnergyItem.code)}">Wireframe</option>
-				</select>
-				<div>
-					<div th:each="err : ${#fields.errors('taskEnergy')}" th:text="${err}" class="alert alert-danger">
-					</div>
-				</div>
-			</span>&nbsp;
-			<span class="form-group form-control-lg">
-				<label th:for="${#ids.next('taskTime')}" class="control-label">
-					<span th:utext="#{task.show.taskTime}">Time</span>
-				</label>
-				<select th:field="*{taskTime}">
-					<option th:each="taskTimeItem : ${listTaskTime}"
-							th:value="${taskTimeItem.value}"
-							th:text="${#messages.msgOrNull(taskTimeItem.code)}">Wireframe</option>
-				</select>
-				<div>
-					<div th:each="err : ${#fields.errors('taskTime')}" th:text="${err}" class="alert alert-danger">
-					</div>
-				</div>
-			</span>&nbsp;
-			<span class="form-group form-control-lg">
-				<label th:for="${#ids.next('context.id')}" class="control-label">
-					<span th:utext="#{task.show.context}">Area</span>
-				</label>
-				<select th:field="*{context.id}">
-					<option th:each="areaOption : ${contexts}"
-							th:value="${areaOption.id}"
-							th:text="${locale == 'de' ? areaOption.nameDe : areaOption.nameEn}">Wireframe</option>
-				</select>
-				<div>
-					<div th:each="err : ${#fields.errors('context.id')}" th:text="${err}" class="alert alert-danger">
-					</div>
-				</div>
-			</span>
-		</div>
-        <input type="hidden"
-               name="${_csrf.parameterName}"
-               value="${_csrf.token}"/>
-		<button id="createNewTask" type="submit" class="btn btn-primary">
-			<i class="fas fa-save"></i>
-			<span th:utext="#{task.add.button}">Add Task</span>
-		</button>
+	<form id="formId" class="was-validated" method="post"
+          th:action="@{/project/root/task/add/}" th:object="${task}">
+        <div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
+        <div class="form-row">
+            <div class="col-md-12 mb-12">
+                <button id="createNewTask" type="submit" class="btn btn-block btn-primary">
+                    <i class="fas fa-save"></i>
+                    <span th:utext="#{task.add.button}">Add Task</span>
+                </button>
+            </div>
+        </div>
 	</form>
 </div>
 

From 5baa74b2433c0e1205e833cb0caa89ac6ca9a897 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 19:47:19 +0200
Subject: [PATCH 35/47] work in progress

---
 .../resources/templates/layout/project.html   | 60 +++++++++++++++++++
 .../templates/project/id/project/add.html     | 54 ++++-------------
 .../templates/project/root/project/add.html   | 54 ++++-------------
 3 files changed, 84 insertions(+), 84 deletions(-)
 create mode 100644 src/main/resources/templates/layout/project.html

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 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
+      xmlns:sd="http://www.thymeleaf.org/spring-data">
+
+    <div th:fragment="tw-project-form(project,contexts)">
+        <input type="hidden" th:field="*{id}" />
+        <input type="hidden" th:field="*{uuid}" />
+        <input type="hidden" th:field="*{rowCreatedAt.time}" />
+        <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
+        <div class="form-row">
+            <div class="col-md-12 mb-12">
+                <div class="form-group">
+                    <label th:for="${#ids.next('name')}" class="control-label">Name</label>
+                    <input type="text" th:field="*{name}" class="form-control form-control-lg" />
+                    <div th:each="err : ${#fields.errors('name')}">
+                        <div class="invalid-feedback" th:text="${err}" >err</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="form-row">
+            <div class="col-md-12 mb-12">
+                <div class="form-group">
+                    <label th:for="textEditor"  class="control-label">
+                        <span th:utext="#{project.add.description}">Description</span>
+                    </label>
+                    <textarea id="textEditor" name="textEditor" rows="10" cols="50"
+                              class="form-control form-control-lg"
+                              th:field="*{description}" >
+                    </textarea>
+                    <div th:each="err : ${#fields.errors('description')}">
+                        <div class="invalid-feedback" th:text="${err}" >err</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="form-row">
+            <div class="col-md-12 mb-12">
+                <div class="form-group">
+                    <label th:for="${#ids.next('context.id')}" class="control-label">
+                        <span th:utext="#{project.edit.context}">context</span>
+                    </label>
+                    <select th:field="*{context.id}" class="form-control form-control-lg">
+                        <option th:each="contextOption : ${contexts}"
+                                th:value="${contextOption.id}"
+                                th:text="${locale == 'de' ? contextOption.nameDe : contextOption.nameEn}">
+                            contextOption
+                        </option>
+                    </select>
+                    <div th:each="err : ${#fields.errors('context.id')}">
+                        <div class="invalid-feedback" th:text="${err}" >err</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+</html>
diff --git a/src/main/resources/templates/project/id/project/add.html b/src/main/resources/templates/project/id/project/add.html
index 64e26ad5..e75f0364 100644
--- a/src/main/resources/templates/project/id/project/add.html
+++ b/src/main/resources/templates/project/id/project/add.html
@@ -18,48 +18,18 @@ <h1>
 </div>
 
 <div th:fragment="mytwcontent">
-	<div>
-	<form id="formId" th:action="@{/project/{id}/project/add(id=${thisProject.id})}" th:object="${project}" method="post">
-		<div class="form-group form-control-lg">
-			<label th:for="${#ids.next('name')}" class="control-label">Name</label>
-			<input type="text" th:field="*{name}" class="form-control" />
-			<div>
-				<div th:each="err : ${#fields.errors('name')}" th:text="${err}" class="alert alert-danger"></div>
-			</div>
-		</div>
-		<div class="form-group form-control-lg">
-			<label th:for="textEditor"  class="control-label">
-				<span th:utext="#{project.add.description}">Description</span>
-			</label>
-			<textarea id="textEditor" name="textEditor" rows="10" cols="50" th:field="*{description}" class="form-control"></textarea>
-			<div>
-				<div th:each="err : ${#fields.errors('description')}" th:text="${err}" class="alert alert-danger"></div>
-			</div>
-		</div>
-		<div class="form-group form-control-lg">
-			<label th:for="${#ids.next('context.id')}" class="control-label">
-				<span th:utext="#{project.edit.context}">Area</span>
-			</label>
-			<select th:field="*{context.id}">
-				<option th:each="areaOption : ${contexts}"
-						th:value="${areaOption.id}"
-						th:text="${locale == 'de' ? areaOption.nameDe : areaOption.nameEn}">Wireframe</option>
-			</select>
-			<div>
-				<div th:each="err : ${#fields.errors('context.id')}" th:text="${err}" class="alert alert-danger"></div>
-			</div>
-		</div>
-		<button id="createNewProject" type="submit" class="btn btn-primary">
-			<i class="fas fa-save"></i>
-			<span th:utext="#{project.add.button}">Add Project</span>
-		</button>
-        <input type="hidden"
-               name="${_csrf.parameterName}"
-               value="${_csrf.token}"/>
-	</form>
-	</div>
-	<!-- Document Window End -->
-
+    <form id="formId" class="was-validated" method="post"
+          th:action="@{/project/{id}/project/add(id=${thisProject.id})}" th:object="${project}">
+        <div th:replace="layout/project :: tw-project-form(project=${project},contexts=${contexts})"></div>
+        <div class="form-row">
+            <div class="col-md-12 mb-12">
+                <button id="createNewProject" type="submit" class="btn btn-block btn-primary">
+                    <i class="fas fa-save"></i>
+                    <span th:utext="#{project.add.button}">Add Project</span>
+                </button>
+            </div>
+        </div>
+    </form>
 </div>
 
 	<script th:src="@{/webjars/ckeditor/4.14.0/full/ckeditor.js}"></script>
diff --git a/src/main/resources/templates/project/root/project/add.html b/src/main/resources/templates/project/root/project/add.html
index 733759db..12e15db4 100644
--- a/src/main/resources/templates/project/root/project/add.html
+++ b/src/main/resources/templates/project/root/project/add.html
@@ -18,48 +18,18 @@ <h1>
 </div>
 
 <div th:fragment="mytwcontent">
-	<div>
-	<form id="formId" th:action="@{/project/root/project/add}" th:object="${project}" method="post">
-		<div class="form-group form-control-lg">
-			<label th:for="${#ids.next('name')}" class="control-label">Name</label>
-			<input type="text" th:field="*{name}" class="form-control" />
-			<div>
-				<div th:each="err : ${#fields.errors('name')}" th:text="${err}" class="alert alert-danger"></div>
-			</div>
-		</div>
-		<div class="form-group form-control-lg">
-			<label th:for="textEditor"  class="control-label">
-				<span th:utext="#{project.add.description}">Description</span>
-			</label>
-			<textarea id="textEditor" name="textEditor" rows="10" cols="50" th:field="*{description}" class="form-control"></textarea>
-			<div>
-				<div th:each="err : ${#fields.errors('description')}" th:text="${err}" class="alert alert-danger"></div>
-			</div>
-		</div>
-		<div class="form-group form-control-lg">
-			<label th:for="${#ids.next('context.id')}" class="control-label">
-				<span th:utext="#{project.edit.context}">Area</span>
-			</label>
-			<select th:field="*{context.id}">
-				<option th:each="areaOption : ${contexts}"
-						th:value="${areaOption.id}"
-						th:text="${locale == 'de' ? areaOption.nameDe : areaOption.nameEn}">Wireframe</option>
-			</select>
-			<div>
-				<div th:each="err : ${#fields.errors('context.id')}" th:text="${err}" class="alert alert-danger"></div>
-			</div>
-		</div>
-		<button id="createNewProject" type="submit" class="btn btn-primary">
-			<i class="fas fa-save"></i>
-			<span th:utext="#{project.add.button}">Add Project</span>
-		</button>
-        <input type="hidden"
-               name="${_csrf.parameterName}"
-               value="${_csrf.token}"/>
-	</form>
-	</div>
-	<!-- Document Window End -->
-
+    <form id="formId" class="was-validated" method="post"
+          th:action="@{/project/root/project/add}" th:object="${project}">
+        <div th:replace="layout/project :: tw-project-form(project=${project},contexts=${contexts})"></div>
+        <div class="form-row">
+            <div class="col-md-12 mb-12">
+                <button id="createNewProject" type="submit" class="btn btn-block btn-primary">
+                    <i class="fas fa-save"></i>
+                    <span th:utext="#{project.add.button}">Add Project</span>
+                </button>
+            </div>
+        </div>
+    </form>
 </div>
 
 	<script th:src="@{/webjars/ckeditor/4.14.0/full/ckeditor.js}"></script>

From 60aeb21cba1519593cae5640fa58c33979848239 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 20:33:49 +0200
Subject: [PATCH 36/47] work in progress

---
 .../resources/templates/project/id/show.html  | 62 ++++++++++++-------
 .../templates/project/root/show.html          | 22 ++++---
 .../templates/taskstate/completed.html        | 22 ++++---
 .../resources/templates/taskstate/inbox.html  | 22 ++++---
 .../resources/templates/taskstate/trash.html  | 21 ++++---
 5 files changed, 90 insertions(+), 59 deletions(-)

diff --git a/src/main/resources/templates/project/id/show.html b/src/main/resources/templates/project/id/show.html
index f5f983b7..b7e424f2 100644
--- a/src/main/resources/templates/project/id/show.html
+++ b/src/main/resources/templates/project/id/show.html
@@ -19,30 +19,44 @@ <h1>
 			</small>
 		</h1>
 		<div id="tw-content-title-actionbuttons">
-			<a class="btn btn-sm btn-primary" data-toggle="collapse"
-               href="#collapseDescription" role="button" aria-expanded="false" aria-controls="collapseExample">
-				<div th:text="#{project.show.description}">Project Description</div>
-			</a>
-			<a class="btn btn-sm btn-secondary" role="button" href="#"
-               th:href="@{/project/{thisProjectId}/edit(thisProjectId=${thisProject.id})}">
-				<i class="fas fa-edit"></i>
-				<span th:text="#{project.show.edit}">Edit Project</span>
-			</a>
-			<a class="btn btn-sm btn-secondary" role="button" href="#"
-               th:href="@{/project/{thisProjectId}/delete(thisProjectId=${thisProject.id})}">
-				<i class="fas fa-trash-alt"></i>
-				<span th:text="#{project.show.delete}">Delete Project</span>
-			</a>
-			<a class="btn btn-sm btn-secondary" role="button" href="#"
-               th:href="@{/project/{thisProjectId}/project/add(thisProjectId=${thisProject.id})}">
-				<i class="fas fa-plus-square"></i>
-				<span th:text="#{layout.page.addProject}">Add a Project</span>
-			</a>
-			<a class="btn btn-sm btn-secondary" role="button" href="#"
-               th:href="@{/project/{thisProjectId}/task/add(thisProjectId=${thisProject.id})}">
-				<i class="fas fa-plus-square"></i>
-				<span th:text="#{project.show.addTask}">Add a Task</span>
-			</a>
+            <div class="row">
+                <div class="col-md-3 mb-3">
+                    <a class="btn btn-block btn-primary" role="button" href="#"
+                       th:href="@{/project/{thisProjectId}/task/add(thisProjectId=${thisProject.id})}">
+                        <i class="fas fa-plus-square"></i>
+                        <span th:text="#{project.show.addTask}">Add a Task</span>
+                    </a>
+                </div>
+                <div class="col-md-3 mb-3">
+                    <a class="btn btn-block btn-secondary" role="button" href="#"
+                       th:href="@{/project/{thisProjectId}/project/add(thisProjectId=${thisProject.id})}">
+                        <i class="fas fa-plus-square"></i>
+                        <span th:text="#{layout.page.addProject}">Add a Project</span>
+                    </a>
+                </div>
+                <div class="col-md-3 mb-3">
+                    <a class="btn btn-block btn-dark" role="button" href="#"
+                       th:href="@{/project/{thisProjectId}/edit(thisProjectId=${thisProject.id})}">
+                        <i class="fas fa-edit"></i>
+                        <span th:text="#{project.show.edit}">Edit Project</span>
+                    </a>
+                </div>
+                <div class="col-md-3 mb-3">
+                    <a class="btn btn-block btn-dark" role="button" href="#"
+                       th:href="@{/project/{thisProjectId}/delete(thisProjectId=${thisProject.id})}">
+                        <i class="fas fa-trash-alt"></i>
+                        <span th:text="#{project.show.delete}">Delete Project</span>
+                    </a>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-md-12 mb-12">
+                    <a class="btn btn-block btn-secondary" data-toggle="collapse"
+                       href="#collapseDescription" role="button" aria-expanded="false" aria-controls="collapseExample">
+                        <div th:text="#{project.show.description}">Project Description</div>
+                    </a>
+                </div>
+            </div>
 		</div>
 		<div class="collapse" id="collapseDescription">
 			<div class="card card-body" th:text="${thisProject.description}"></div>
diff --git a/src/main/resources/templates/project/root/show.html b/src/main/resources/templates/project/root/show.html
index c67bdb0c..be85f9e6 100644
--- a/src/main/resources/templates/project/root/show.html
+++ b/src/main/resources/templates/project/root/show.html
@@ -15,15 +15,19 @@ <h1>
 			<i class="fas fa-folder-open"></i>
 			<span th:text="#{project.show.h1}">Project</span>
 		</h1>
-		<div id="tw-content-title-actionbuttons">
-			<a class="btn btn-sm btn-secondary" role="button" th:href="@{/project/root/project/add}">
-				<i class="fas fa-plus-square"></i>
-				<span th:text="#{layout.page.addProject}">Add a Project</span>
-			</a>
-			<a class="btn btn-sm btn-secondary" role="button" th:href="@{/project/root/task/add}" href="#">
-				<i class="fas fa-plus-square"></i>
-				<span th:text="#{project.show.addTask}">Add a Task</span>
-			</a>
+		<div id="tw-content-title-actionbuttons" class="row">
+            <div class="col-md-3 mb-3">
+                <a class="btn btn-block btn-primary" role="button" th:href="@{/project/root/task/add}">
+                    <i class="fas fa-plus-square"></i>
+                    <span th:text="#{project.show.addTask}">Add a Task</span>
+                </a>
+            </div>
+            <div class="col-md-3 mb-3">
+                <a class="btn btn-block btn-secondary" role="button" th:href="@{/project/root/project/add}">
+                    <i class="fas fa-plus-square"></i>
+                    <span th:text="#{layout.page.addProject}">Add a Project</span>
+                </a>
+            </div>
 		</div>
 	</div>
 </div>
diff --git a/src/main/resources/templates/taskstate/completed.html b/src/main/resources/templates/taskstate/completed.html
index 64e28a4b..79a05ebc 100644
--- a/src/main/resources/templates/taskstate/completed.html
+++ b/src/main/resources/templates/taskstate/completed.html
@@ -11,15 +11,19 @@
 
     <div th:fragment="mytwtitle">
         <div id="tw-content-title">
-            <h1>
-                <i class="fas fa-check-square"></i>
-                <span th:utext="#{tasks.completed.h1}">Completed Tasks</span>
-            </h1>
-            <div id="tw-content-title-actionbuttons">
-                <a th:href="@{/task/move/completed/to/trash}" class="btn btn-sm btn-primary" role="button">
-                    <i class="fas fa-trash-alt"></i>
-                    <span th:utext="#{tasks.completed.delete}">Delete All Completed Tasks</span>
-                </a>
+            <div class="row">
+                <h1 class="col-md-12 mb-12">
+                    <i class="fas fa-check-square"></i>
+                    <span th:utext="#{tasks.completed.h1}">Completed Tasks</span>
+                </h1>
+            </div>
+            <div class="row">
+                <div id="tw-content-title-actionbuttons" class="col-md-3 mb-3">
+                    <a th:href="@{/task/move/completed/to/trash}" class="btn btn-block btn-primary" role="button">
+                        <i class="fas fa-trash-alt"></i>
+                        <span th:utext="#{tasks.completed.delete}">Delete All Completed Tasks</span>
+                    </a>
+                </div>
             </div>
         </div>
     </div>
diff --git a/src/main/resources/templates/taskstate/inbox.html b/src/main/resources/templates/taskstate/inbox.html
index 148705f8..363ec864 100644
--- a/src/main/resources/templates/taskstate/inbox.html
+++ b/src/main/resources/templates/taskstate/inbox.html
@@ -11,15 +11,19 @@
 
     <div th:fragment="mytwtitle">
         <div id="tw-content-title">
-            <h1>
-                <i class="fas fa-inbox"></i>
-                <span th:utext="#{tasks.inbox.h1}">Inbox</span>
-            </h1>
-            <div id="tw-content-title-actionbuttons">
-                <a class="btn btn-sm btn-primary" role="button" th:href="@{/taskstate/task/add}">
-                    <i class="fas fa-plus-square"></i>
-                    <span th:utext="#{tasks.inbox.addTask}">Add Task</span>
-                </a>
+            <div class="row">
+                <h1 class="col-md-12 mb-12">
+                    <i class="fas fa-inbox"></i>
+                    <span th:utext="#{tasks.inbox.h1}">Inbox</span>
+                </h1>
+            </div>
+            <div class="row">
+                <div id="tw-content-title-actionbuttons" class="col-md-3 mb-3">
+                    <a class="btn btn-block btn-primary" role="button" th:href="@{/taskstate/task/add}">
+                        <i class="fas fa-plus-square"></i>
+                        <span th:utext="#{tasks.inbox.addTask}">Add Task</span>
+                    </a>
+                </div>
             </div>
         </div>
     </div>
diff --git a/src/main/resources/templates/taskstate/trash.html b/src/main/resources/templates/taskstate/trash.html
index 03fcd203..841510ee 100644
--- a/src/main/resources/templates/taskstate/trash.html
+++ b/src/main/resources/templates/taskstate/trash.html
@@ -11,15 +11,20 @@
 
     <div th:fragment="mytwtitle">
         <div id="tw-content-title">
-            <h1>
-                <i class="fas fa-trash-alt"></i>
-                <span th:utext="#{tasks.trash.h1}">Trash</span>
-            </h1>
-            <div id="tw-content-title-actionbuttons">
-                <a th:href="@{/task/move/trash/to/void}" class="btn btn-sm btn-primary" role="button">
+            <div class="row">
+                <h1 class="col-md-12 mb-12">
                     <i class="fas fa-trash-alt"></i>
-                    <span th:utext="#{tasks.trash.empty}">Empty Trash</span>
-                </a>
+                    <span th:utext="#{tasks.trash.h1}">Trash</span>
+                </h1>
+            </div>
+            </div>
+            <div class="row">
+                <div id="tw-content-title-actionbuttons" class="col-md-3 mb-3">
+                    <a th:href="@{/task/move/trash/to/void}" class="btn btn-block btn-primary" role="button">
+                        <i class="fas fa-trash-alt"></i>
+                        <span th:utext="#{tasks.trash.empty}">Empty Trash</span>
+                    </a>
+                </div>
             </div>
         </div>
     </div>

From c446f7752314fb14ec19de02f24deacf5ad9c251 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 20:40:31 +0200
Subject: [PATCH 37/47] work in progress

---
 .../resources/templates/layout/{taskedit.html => task.html}     | 2 +-
 src/main/resources/templates/project/id/show.html               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename src/main/resources/templates/layout/{taskedit.html => task.html} (98%)

diff --git a/src/main/resources/templates/layout/taskedit.html b/src/main/resources/templates/layout/task.html
similarity index 98%
rename from src/main/resources/templates/layout/taskedit.html
rename to src/main/resources/templates/layout/task.html
index 482671da..f8ec8718 100644
--- a/src/main/resources/templates/layout/taskedit.html
+++ b/src/main/resources/templates/layout/task.html
@@ -4,7 +4,7 @@
       xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
       xmlns:sd="http://www.thymeleaf.org/spring-data">
 
-    <div th:fragment="tw-task-edit-form(task,listTaskState,listTaskEnergy,listTaskTime,contexts)">
+    <div th:fragment="tw-task-form(task,listTaskState,listTaskEnergy,listTaskTime,contexts)">
         <input type="hidden" th:field="*{id}" />
         <input type="hidden" th:field="*{uuid}" />
         <input type="hidden" th:field="*{focus}" />
diff --git a/src/main/resources/templates/project/id/show.html b/src/main/resources/templates/project/id/show.html
index b7e424f2..1c3ee770 100644
--- a/src/main/resources/templates/project/id/show.html
+++ b/src/main/resources/templates/project/id/show.html
@@ -51,7 +51,7 @@ <h1>
             </div>
             <div class="row">
                 <div class="col-md-12 mb-12">
-                    <a class="btn btn-block btn-secondary" data-toggle="collapse"
+                    <a class="btn btn-block btn-outline-secondary" data-toggle="collapse"
                        href="#collapseDescription" role="button" aria-expanded="false" aria-controls="collapseExample">
                         <div th:text="#{project.show.description}">Project Description</div>
                     </a>

From 8567d229155f7b3b8c92dd9bdeb54addb04632d0 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 20:43:07 +0200
Subject: [PATCH 38/47] work in progress

---
 src/main/resources/templates/project/id/task/add.html    | 2 +-
 src/main/resources/templates/project/id/task/edit.html   | 2 +-
 src/main/resources/templates/project/root/task/add.html  | 2 +-
 src/main/resources/templates/project/root/task/edit.html | 2 +-
 src/main/resources/templates/taskstate/task/add.html     | 2 +-
 src/main/resources/templates/taskstate/task/edit.html    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/templates/project/id/task/add.html b/src/main/resources/templates/project/id/task/add.html
index 4abb6868..19c1dc51 100644
--- a/src/main/resources/templates/project/id/task/add.html
+++ b/src/main/resources/templates/project/id/task/add.html
@@ -20,7 +20,7 @@ <h1>
 <div th:fragment="mytwcontent">
 	<form id="formId" class="was-validated" method="post"
           th:action="@{/project/{projectId}/task/add(projectId=${thisProject.id})}" th:object="${task}">
-        <div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
+        <div th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
         <div class="form-row">
             <div class="col-md-12 mb-12">
                 <button id="createNewTask" type="submit" class="btn btn-block btn-primary">
diff --git a/src/main/resources/templates/project/id/task/edit.html b/src/main/resources/templates/project/id/task/edit.html
index 84147ba6..0ee7536e 100644
--- a/src/main/resources/templates/project/id/task/edit.html
+++ b/src/main/resources/templates/project/id/task/edit.html
@@ -21,7 +21,7 @@ <h1>
 	<div>
 		<form id="formId" th:object="${task}" method="post" class="was-validated"
               th:action="@{/project/{projectId}/task/{taskId}/edit(taskId=${task.id},projectId=${thisProject.id})}" >
-            <div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
+            <div th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
             <div class="form-row">
                 <div class="col-md-6 mb-6">
                     <button id="editTaskSubmit" type="submit" class="btn btn-primary btn-block">
diff --git a/src/main/resources/templates/project/root/task/add.html b/src/main/resources/templates/project/root/task/add.html
index f33b5734..0a7d3208 100644
--- a/src/main/resources/templates/project/root/task/add.html
+++ b/src/main/resources/templates/project/root/task/add.html
@@ -20,7 +20,7 @@ <h1>
 <div th:fragment="mytwcontent">
 	<form id="formId" class="was-validated" method="post"
           th:action="@{/project/root/task/add/}" th:object="${task}">
-        <div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
+        <div th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
         <div class="form-row">
             <div class="col-md-12 mb-12">
                 <button id="createNewTask" type="submit" class="btn btn-block btn-primary">
diff --git a/src/main/resources/templates/project/root/task/edit.html b/src/main/resources/templates/project/root/task/edit.html
index 7194decb..18930f1c 100644
--- a/src/main/resources/templates/project/root/task/edit.html
+++ b/src/main/resources/templates/project/root/task/edit.html
@@ -21,7 +21,7 @@ <h1 class="tw-title">
 	<div class="tw-content">
 		<form id="formId" method="post" class="was-validated"
               th:action="@{/project/root/task/{taskId}/edit(taskId=${task.id})}" th:object="${task}">
-            <div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
+            <div th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
             <div class="form-row">
                 <div class="col-md-6 mb-6">
                     <button id="editTaskSubmit" type="submit" class="btn btn-primary btn-block">
diff --git a/src/main/resources/templates/taskstate/task/add.html b/src/main/resources/templates/taskstate/task/add.html
index 34c099fb..da2c86c5 100644
--- a/src/main/resources/templates/taskstate/task/add.html
+++ b/src/main/resources/templates/taskstate/task/add.html
@@ -20,7 +20,7 @@ <h1>
 <div th:fragment="mytwcontent">
 	<form id="formId" class="was-validated"
           th:action="@{/taskstate/task/add}" th:object="${task}" method="post">
-        <div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
+        <div th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
         <div class="form-row">
             <div class="col-md-12 mb-12">
                 <button id="createNewTask" type="submit" class="btn btn-block btn-primary">
diff --git a/src/main/resources/templates/taskstate/task/edit.html b/src/main/resources/templates/taskstate/task/edit.html
index e8202b05..ec30ef9f 100644
--- a/src/main/resources/templates/taskstate/task/edit.html
+++ b/src/main/resources/templates/taskstate/task/edit.html
@@ -21,7 +21,7 @@ <h1>
 	<div>
 		<form id="formId" method="post" class="was-validated"
               th:action="@{/taskstate/task/{taskId}/edit(taskId=${task.id})}" th:object="${task}">
-            <div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
+            <div th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
             <div class="form-row">
                 <div class="col-md-6 mb-6">
                     <button id="editTaskSubmit" type="submit" class="btn btn-primary btn-block">

From 138dc0b013e36793dd85945614f151158423e729 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 21:00:56 +0200
Subject: [PATCH 39/47] work in progress

---
 src/main/resources/templates/taskstate/completed.html | 3 ++-
 src/main/resources/templates/taskstate/trash.html     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/templates/taskstate/completed.html b/src/main/resources/templates/taskstate/completed.html
index 79a05ebc..f70c9f8e 100644
--- a/src/main/resources/templates/taskstate/completed.html
+++ b/src/main/resources/templates/taskstate/completed.html
@@ -19,7 +19,8 @@ <h1 class="col-md-12 mb-12">
             </div>
             <div class="row">
                 <div id="tw-content-title-actionbuttons" class="col-md-3 mb-3">
-                    <a th:href="@{/task/move/completed/to/trash}" class="btn btn-block btn-primary" role="button">
+                    <a th:href="@{/taskstate/task/completed/move/to/trash}"
+                       class="btn btn-block btn-primary" role="button">
                         <i class="fas fa-trash-alt"></i>
                         <span th:utext="#{tasks.completed.delete}">Delete All Completed Tasks</span>
                     </a>
diff --git a/src/main/resources/templates/taskstate/trash.html b/src/main/resources/templates/taskstate/trash.html
index 841510ee..1dadde56 100644
--- a/src/main/resources/templates/taskstate/trash.html
+++ b/src/main/resources/templates/taskstate/trash.html
@@ -20,7 +20,7 @@ <h1 class="col-md-12 mb-12">
             </div>
             <div class="row">
                 <div id="tw-content-title-actionbuttons" class="col-md-3 mb-3">
-                    <a th:href="@{/task/move/trash/to/void}" class="btn btn-block btn-primary" role="button">
+                    <a th:href="@{/taskstate/task/trash/empty}" class="btn btn-block btn-primary" role="button">
                         <i class="fas fa-trash-alt"></i>
                         <span th:utext="#{tasks.trash.empty}">Empty Trash</span>
                     </a>

From eb3bb280d93d050786c7b4c1a4dad8017c21294a Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 21:03:21 +0200
Subject: [PATCH 40/47] work in progress

---
 src/main/resources/templates/taskstate/completed.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/templates/taskstate/completed.html b/src/main/resources/templates/taskstate/completed.html
index f70c9f8e..1ddc5ab6 100644
--- a/src/main/resources/templates/taskstate/completed.html
+++ b/src/main/resources/templates/taskstate/completed.html
@@ -30,7 +30,8 @@ <h1 class="col-md-12 mb-12">
     </div>
 
     <div th:fragment="mytwcontent">
-        <div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
+        <div th:replace="layout/tasks :: tw-tasks-message(message=${message})"
+             th:if="${message} != null" id="mytwcontent-message">
         </div>
         <div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
             <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='COMPLETED', myUrlPath='/taskstate')">
@@ -41,6 +42,5 @@ <h1 class="col-md-12 mb-12">
         </div>
     </div>
 
-
 </body>
 </html>

From 0415c20886d44ca21a851727f20a6d24d290b626 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 21:32:22 +0200
Subject: [PATCH 41/47] work in progress

---
 etc/TODO.md                                      | 11 +++++++++++
 .../project/ProjectController.java               | 16 +++++++++++++++-
 .../project/ProjectControllerRoot.java           |  7 ++++---
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/etc/TODO.md b/etc/TODO.md
index 76e655da..c87de49d 100644
--- a/etc/TODO.md
+++ b/etc/TODO.md
@@ -98,3 +98,14 @@ https://github.com/thymeleaf/thymeleaf-testing
 
 # 2.3.16 
 Fixed #169, Fixed #170, Fixed #171, Fixed #172, Fixed #183 
+
+
+# 2.3.17
+#226 
+#227
+#228
+#229
+#230
+#231
+#232
+#233 
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
index b667134d..b8ec6e47 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
+++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
@@ -35,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)
@@ -601,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 aad6f4f0..b1c1b42a 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java
+++ b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java
@@ -35,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)
@@ -479,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)

From 00849767567cc0976b60ff9ad34230f5dcc69c74 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 21:36:00 +0200
Subject: [PATCH 42/47] work in progress

---
 src/main/resources/templates/project/root/task/edit.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/templates/project/root/task/edit.html b/src/main/resources/templates/project/root/task/edit.html
index 18930f1c..258b1057 100644
--- a/src/main/resources/templates/project/root/task/edit.html
+++ b/src/main/resources/templates/project/root/task/edit.html
@@ -30,7 +30,7 @@ <h1 class="tw-title">
                     </button>
                 </div>
                 <div class="col-md-6 mb-6">
-                    <a th:href="@{/task/{id}/transform(id=${task.id})}" class="btn btn-secondary btn-block" role="button">
+                    <a th:href="@{/project/root/task/{id}/transform(id=${task.id})}" class="btn btn-secondary btn-block" role="button">
                         <i class="fas fa-project-diagram"></i>
                         <span th:utext="#{task.show.transform}">Transform into Project</span>
                     </a>

From 54fcbe903aa0dc30684c439671e723c6f9339824 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 21:40:18 +0200
Subject: [PATCH 43/47] Fixed #223, Fixed #224, Fixed #225, Fixed #226, Fixed
 #227, Fixed #228, Fixed #229, Fixed #230, Fixed #231, Fixed #232, Fixed #233

---
 etc/TODO.md | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/etc/TODO.md b/etc/TODO.md
index c87de49d..254c3d71 100644
--- a/etc/TODO.md
+++ b/etc/TODO.md
@@ -101,11 +101,4 @@ Fixed #169, Fixed #170, Fixed #171, Fixed #172, Fixed #183
 
 
 # 2.3.17
-#226 
-#227
-#228
-#229
-#230
-#231
-#232
-#233 
+Fixed #223, Fixed #224, Fixed #225, Fixed #226, Fixed #227, Fixed #228, Fixed #229, Fixed #230, Fixed #231, Fixed #232, Fixed #233 

From f2ce58a6a7d3bbc6caf34e6ee1a74b27ab4af9ce Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 21:50:13 +0200
Subject: [PATCH 44/47] 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

---
 etc/TODO.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/etc/TODO.md b/etc/TODO.md
index 254c3d71..9af6c47c 100644
--- a/etc/TODO.md
+++ b/etc/TODO.md
@@ -102,3 +102,5 @@ 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 

From e8a19acb3feb24d7d1e321f2eeb0503c7f6ed132 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 21:56:24 +0200
Subject: [PATCH 45/47] Fixed #220, Fixed #221, Fixed #222

---
 etc/TODO.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/etc/TODO.md b/etc/TODO.md
index 9af6c47c..d161abce 100644
--- a/etc/TODO.md
+++ b/etc/TODO.md
@@ -104,3 +104,5 @@ Fixed #169, Fixed #170, Fixed #171, Fixed #172, Fixed #183
 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 

From b0682e62a53327303f0777b3a67513d796901da5 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 21:58:47 +0200
Subject: [PATCH 46/47] Fixed #220, Fixed #221, Fixed #222

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c1ac5d90..74c90aac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.woehlke</groupId>
     <artifactId>simpleworklist</artifactId>
-    <version>2.3.16-SNAPSHOT</version>
+    <version>2.3.17</version>
 	<packaging>jar</packaging>
     <parent>
         <groupId>org.springframework.boot</groupId>

From 754ecb5ae1f948c431e5891c922bf6fc7afb20ba Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@rub.de>
Date: Sat, 11 Apr 2020 22:00:10 +0200
Subject: [PATCH 47/47] Fixed #220, Fixed #221, Fixed #222

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 74c90aac..f021115b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.woehlke</groupId>
     <artifactId>simpleworklist</artifactId>
-    <version>2.3.17</version>
+    <version>2.3.18-SNAPSHOT</version>
 	<packaging>jar</packaging>
     <parent>
         <groupId>org.springframework.boot</groupId>