diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index f370730b..a0075a11 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -16,9 +16,9 @@ jobs:
steps:
- uses: actions/checkout@v2
- - name: Set up JDK 1.8
+ - name: Set up JDK 11
uses: actions/setup-java@v1
with:
- java-version: 1.8
+ java-version: 11
- name: Build with Maven
run: ./mvnw -B -DskipTests clean dependency:list install --file pom.xml
diff --git a/.gitignore b/.gitignore
index 7bfa43e0..39d43258 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,5 +35,5 @@ setenv.cmd
/src/main/java/org/woehlke/simpleworklist/context/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
+
+/simpleworklist.diff
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index da7c220a..65f470b1 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -11,7 +11,7 @@
-
+
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 63e90019..aa00ffab 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -2,5 +2,6 @@
+
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 712ab9d9..f0961de4 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -2,19 +2,89 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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
deleted file mode 100644
index b8d93d8e..00000000
--- a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 682831e2..00000000
--- a/.idea/libraries/Maven__avalon_framework_avalon_framework_4_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index c5ed7930..00000000
--- a/.idea/libraries/Maven__backport_util_concurrent_backport_util_concurrent_3_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 1c86a465..00000000
--- a/.idea/libraries/Maven__ch_ethz_ganymed_ganymed_ssh2_build210.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 6fec8f43..00000000
--- a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 9eb8596a..00000000
--- a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index e4273c0b..00000000
--- a/.idea/libraries/Maven__classworlds_classworlds_1_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index ad12dd9b..00000000
--- a/.idea/libraries/Maven__com_beust_jcommander_1_72.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 78abe57f..00000000
--- a/.idea/libraries/Maven__com_dkanejs_maven_plugins_docker_compose_maven_plugin_maven_plugin_4_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index bc7d7fd8..00000000
--- a/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index aa94641a..00000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_10_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index e94ceb75..00000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_10_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 656ffa49..00000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_10_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 7261701c..00000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_10_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 5124c4ce..00000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_10_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 31b440cc..00000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_10_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 8cb87b65..00000000
--- a/.idea/libraries/Maven__com_github_mxab_thymeleaf_extras_thymeleaf_extras_data_attribute_2_0_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 9e7f0f76..00000000
--- a/.idea/libraries/Maven__com_github_spotbugs_spotbugs_4_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 52c76e54..00000000
--- a/.idea/libraries/Maven__com_github_spotbugs_spotbugs_annotations_4_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 49c15455..00000000
--- a/.idea/libraries/Maven__com_github_spotbugs_spotbugs_maven_plugin_maven_plugin_4_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 1c380d0b..00000000
--- a/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 82a9f20a..00000000
--- a/.idea/libraries/Maven__com_google_code_gson_gson_2_8_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 848cecd7..00000000
--- a/.idea/libraries/Maven__com_google_errorprone_error_prone_annotations_2_3_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 36e948e2..00000000
--- a/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 4c148535..00000000
--- a/.idea/libraries/Maven__com_google_guava_guava_28_2_jre.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 4e15702e..00000000
--- a/.idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index bacaa456..00000000
--- a/.idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index f19f6eb3..00000000
--- a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 6767f50e..00000000
--- a/.idea/libraries/Maven__com_puppycrawl_tools_checkstyle_8_29.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index fea99f02..00000000
--- a/.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index bea8d79f..00000000
--- a/.idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index a86e1762..00000000
--- a/.idea/libraries/Maven__com_sun_mail_jakarta_mail_1_6_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 929cba8b..00000000
--- a/.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_1_13.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index aa1516a0..00000000
--- a/.idea/libraries/Maven__com_sun_xml_fastinfoset_FastInfoset_1_2_16.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 78061e10..00000000
--- a/.idea/libraries/Maven__com_thoughtworks_qdox_qdox_2_0_M8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index b8581a6f..00000000
--- a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 0d4f3b33..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index c3977d4c..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_all_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 324e23b2..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_abbreviation_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 3cac41c1..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_admonition_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 1641b453..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_anchorlink_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 80702e4d..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_aside_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index ff46341c..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_attributes_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 8e108150..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_autolink_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index bcdf8729..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_definition_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index dce47c07..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_emoji_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 29079f8d..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_enumerated_reference_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index c7818720..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_escaped_character_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index bf5ea634..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_footnotes_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 03df30ea..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gfm_issues_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 9dd4a65b..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gfm_strikethrough_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 946d09b7..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gfm_tables_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index a1c76a05..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gfm_tasklist_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 5ed6d198..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gfm_users_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 70c69f69..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_gitlab_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 60ab157d..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_ins_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 3ab0fce0..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_jekyll_front_matter_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 29d37e5d..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_jekyll_tag_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 2735ddd6..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_macros_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 10055e92..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_media_tags_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index fcab5b81..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_superscript_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index b03fdda8..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_tables_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index a912accd..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_toc_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 03b7e62d..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_typographic_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 90a9ea27..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_wikilink_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index f62f0153..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_xwiki_macros_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index f13ba6ba..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_yaml_front_matter_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 971476c9..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_ext_youtube_embedded_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 20326ea8..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_formatter_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index d818c373..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_html_parser_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 861a0cee..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_jira_converter_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 8a0ba2b2..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_profile_pegdown_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index b0224d30..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_util_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 5f8a0b85..00000000
--- a/.idea/libraries/Maven__com_vladsch_flexmark_flexmark_youtrack_converter_0_42_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index eeba7092..00000000
--- a/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 84eb1158..00000000
--- a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 6dcfb49f..00000000
--- a/.idea/libraries/Maven__commons_chain_commons_chain_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 5384f7ab..00000000
--- a/.idea/libraries/Maven__commons_codec_commons_codec_1_13.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 13afda29..00000000
--- a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index f1160609..00000000
--- a/.idea/libraries/Maven__commons_digester_commons_digester_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index f040f164..00000000
--- a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_0_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 67c2ad2c..00000000
--- a/.idea/libraries/Maven__commons_io_commons_io_2_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 2ec83767..00000000
--- a/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index ba50ca21..00000000
--- a/.idea/libraries/Maven__commons_logging_commons_logging_1_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 80e2bb56..00000000
--- a/.idea/libraries/Maven__commons_validator_commons_validator_1_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 4968206b..00000000
--- a/.idea/libraries/Maven__dom4j_dom4j_1_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index ec7e783b..00000000
--- a/.idea/libraries/Maven__info_picocli_picocli_4_1_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index b857df8c..00000000
--- a/.idea/libraries/Maven__io_github_jpenren_thymeleaf_spring_data_dialect_3_4_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index be90656e..00000000
--- a/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index cba9dd24..00000000
--- a/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index c11957d9..00000000
--- a/.idea/libraries/Maven__jakarta_persistence_jakarta_persistence_api_2_2_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 5b31fe50..00000000
--- a/.idea/libraries/Maven__jakarta_transaction_jakarta_transaction_api_1_3_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index e66afb95..00000000
--- a/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 04213f73..00000000
--- a/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 180d5875..00000000
--- a/.idea/libraries/Maven__javax_activation_activation_1_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index ff49512a..00000000
--- a/.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index ead2b381..00000000
--- a/.idea/libraries/Maven__javax_mail_mail_1_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index d05c196b..00000000
--- a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index a0c4d766..00000000
--- a/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 059f88ff..00000000
--- a/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index c6d18ad6..00000000
--- a/.idea/libraries/Maven__jaxen_jaxen_1_2_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 3349d675..00000000
--- a/.idea/libraries/Maven__jdom_jdom_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index d4110417..00000000
--- a/.idea/libraries/Maven__junit_junit_4_12.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index f398ab4a..00000000
--- a/.idea/libraries/Maven__log4j_log4j_1_2_12.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index a548880f..00000000
--- a/.idea/libraries/Maven__logkit_logkit_1_0_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 73e43180..00000000
--- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 4d6fd9a2..00000000
--- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index a05ba908..00000000
--- a/.idea/libraries/Maven__net_java_dev_javacc_javacc_5_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index d29c82f6..00000000
--- a/.idea/libraries/Maven__net_jcip_jcip_annotations_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index b3d38583..00000000
--- a/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 10830235..00000000
--- a/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index c8322bf9..00000000
--- a/.idea/libraries/Maven__net_sf_saxon_Saxon_HE_9_9_1_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index a41f97a7..00000000
--- a/.idea/libraries/Maven__net_sourceforge_pmd_pmd_core_6_21_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index c632b833..00000000
--- a/.idea/libraries/Maven__net_sourceforge_pmd_pmd_java_6_21_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index e16e0dfe..00000000
--- a/.idea/libraries/Maven__net_sourceforge_pmd_pmd_javascript_6_21_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 446aaba7..00000000
--- a/.idea/libraries/Maven__net_sourceforge_pmd_pmd_jsp_6_21_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 4139d5f6..00000000
--- a/.idea/libraries/Maven__net_sourceforge_saxon_saxon_9_1_0_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 33621aea..00000000
--- a/.idea/libraries/Maven__net_sourceforge_saxon_saxon_dom_9_1_0_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index da549e9d..00000000
--- a/.idea/libraries/Maven__ognl_ognl_3_1_12.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 1e79170b..00000000
--- a/.idea/libraries/Maven__org_antlr_antlr4_runtime_4_8_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 418a1a95..00000000
--- a/.idea/libraries/Maven__org_apache_ant_ant_1_10_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index d8f37c4e..00000000
--- a/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_10_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index ce96b73e..00000000
--- a/.idea/libraries/Maven__org_apache_bcel_bcel_6_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index b762f0e4..00000000
--- a/.idea/libraries/Maven__org_apache_commons_commons_compress_1_20.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 9050e004..00000000
--- a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_9.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 55816b45..00000000
--- a/.idea/libraries/Maven__org_apache_cxf_cxf_api_2_6_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 619ebf21..00000000
--- a/.idea/libraries/Maven__org_apache_cxf_cxf_rt_bindings_xml_2_6_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 08640c3a..00000000
--- a/.idea/libraries/Maven__org_apache_cxf_cxf_rt_core_2_6_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index c2151968..00000000
--- a/.idea/libraries/Maven__org_apache_cxf_cxf_rt_frontend_jaxrs_2_6_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index c9d99856..00000000
--- a/.idea/libraries/Maven__org_apache_cxf_cxf_rt_transports_http_2_6_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index bd0191fa..00000000
--- a/.idea/libraries/Maven__org_apache_geronimo_javamail_geronimo_javamail_1_4_mail_1_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index a0796f97..00000000
--- a/.idea/libraries/Maven__org_apache_geronimo_javamail_geronimo_javamail_1_4_provider_1_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 10a60d24..00000000
--- a/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_javamail_1_4_spec_1_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 9cb68a28..00000000
--- a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_12.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index b475675a..00000000
--- a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_13.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index ad038546..00000000
--- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_12_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index b4b1b1b6..00000000
--- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_12_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index b2c020e9..00000000
--- a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_core_1_9.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 6a802113..00000000
--- a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_decoration_model_1_9_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 843e5808..00000000
--- a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_integration_tools_1_9_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 8f4af266..00000000
--- a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_logging_api_1_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 53d7c472..00000000
--- a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_apt_1_9_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index c2581887..00000000
--- a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_confluence_1_9_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 75490cbd..00000000
--- a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_docbook_simple_1_9_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 93b39c74..00000000
--- a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_fml_1_9_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 0652ee39..00000000
--- a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_markdown_1_9_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 5f49c36f..00000000
--- a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_twiki_1_9_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index c6f549f4..00000000
--- a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_xdoc_1_9_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index f8647a11..00000000
--- a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_xhtml5_1_9_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 7ca6e275..00000000
--- a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_module_xhtml_1_9_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 2947f85b..00000000
--- a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_sink_api_1_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 7b6ea2f3..00000000
--- a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_site_renderer_1_7_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 2ecd7b6e..00000000
--- a/.idea/libraries/Maven__org_apache_maven_doxia_doxia_skin_model_1_7_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 2fcb38d1..00000000
--- a/.idea/libraries/Maven__org_apache_maven_enforcer_enforcer_api_3_0_0_M3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index f0de8221..00000000
--- a/.idea/libraries/Maven__org_apache_maven_enforcer_enforcer_rules_3_0_0_M3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index c5679011..00000000
--- a/.idea/libraries/Maven__org_apache_maven_maven_aether_provider_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 428c9353..00000000
--- a/.idea/libraries/Maven__org_apache_maven_maven_archiver_3_4_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 4afa3bad..00000000
--- a/.idea/libraries/Maven__org_apache_maven_maven_artifact_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index dc250a12..00000000
--- a/.idea/libraries/Maven__org_apache_maven_maven_artifact_manager_2_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index dbb8b01d..00000000
--- a/.idea/libraries/Maven__org_apache_maven_maven_compat_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 6dea8872..00000000
--- a/.idea/libraries/Maven__org_apache_maven_maven_core_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 34698b64..00000000
--- a/.idea/libraries/Maven__org_apache_maven_maven_jxr_3_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 9235b644..00000000
--- a/.idea/libraries/Maven__org_apache_maven_maven_model_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 39c8f37c..00000000
--- a/.idea/libraries/Maven__org_apache_maven_maven_model_builder_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 91f8ba24..00000000
--- a/.idea/libraries/Maven__org_apache_maven_maven_plugin_api_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 5908a5b2..00000000
--- a/.idea/libraries/Maven__org_apache_maven_maven_plugin_descriptor_2_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 6b914cef..00000000
--- a/.idea/libraries/Maven__org_apache_maven_maven_plugin_registry_2_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 33c5188a..00000000
--- a/.idea/libraries/Maven__org_apache_maven_maven_profile_2_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 42ac7836..00000000
--- a/.idea/libraries/Maven__org_apache_maven_maven_project_2_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index c8cc3a0a..00000000
--- a/.idea/libraries/Maven__org_apache_maven_maven_repository_metadata_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 33b87600..00000000
--- a/.idea/libraries/Maven__org_apache_maven_maven_settings_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 9637cf35..00000000
--- a/.idea/libraries/Maven__org_apache_maven_maven_settings_builder_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 3dfc84db..00000000
--- a/.idea/libraries/Maven__org_apache_maven_maven_toolchain_2_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index bfd7645c..00000000
--- a/.idea/libraries/Maven__org_apache_maven_plugin_tools_maven_plugin_annotations_3_5_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index ee8c7769..00000000
--- a/.idea/libraries/Maven__org_apache_maven_plugins_maven_changes_plugin_maven_plugin_2_12_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index c0caa8dc..00000000
--- a/.idea/libraries/Maven__org_apache_maven_plugins_maven_checkstyle_plugin_maven_plugin_3_1_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 71fad370..00000000
--- a/.idea/libraries/Maven__org_apache_maven_plugins_maven_clean_plugin_maven_plugin_3_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 3d48759d..00000000
--- a/.idea/libraries/Maven__org_apache_maven_plugins_maven_compiler_plugin_maven_plugin_3_8_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index fd487c0f..00000000
--- a/.idea/libraries/Maven__org_apache_maven_plugins_maven_dependency_plugin_maven_plugin_3_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 1e9345ab..00000000
--- a/.idea/libraries/Maven__org_apache_maven_plugins_maven_enforcer_plugin_maven_plugin_3_0_0_M3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 5b01b55d..00000000
--- a/.idea/libraries/Maven__org_apache_maven_plugins_maven_invoker_plugin_maven_plugin_3_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 10ef86b4..00000000
--- a/.idea/libraries/Maven__org_apache_maven_plugins_maven_jxr_plugin_maven_plugin_3_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 335a4023..00000000
--- a/.idea/libraries/Maven__org_apache_maven_plugins_maven_pmd_plugin_maven_plugin_3_13_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 460e8e70..00000000
--- a/.idea/libraries/Maven__org_apache_maven_plugins_maven_project_info_reports_plugin_maven_plugin_3_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index ba866ec4..00000000
--- a/.idea/libraries/Maven__org_apache_maven_plugins_maven_site_plugin_maven_plugin_3_9_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 24e56f32..00000000
--- a/.idea/libraries/Maven__org_apache_maven_plugins_maven_surefire_plugin_maven_plugin_2_22_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index c60bf44e..00000000
--- a/.idea/libraries/Maven__org_apache_maven_plugins_maven_surefire_report_plugin_maven_plugin_3_0_0_M4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index a654238b..00000000
--- a/.idea/libraries/Maven__org_apache_maven_reporting_maven_reporting_api_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index b165a3cf..00000000
--- a/.idea/libraries/Maven__org_apache_maven_reporting_maven_reporting_exec_1_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index e055e8a8..00000000
--- a/.idea/libraries/Maven__org_apache_maven_reporting_maven_reporting_impl_2_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 7182feb4..00000000
--- a/.idea/libraries/Maven__org_apache_maven_resolver_maven_resolver_api_1_4_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index f122b75a..00000000
--- a/.idea/libraries/Maven__org_apache_maven_resolver_maven_resolver_util_1_4_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 5c66cf1e..00000000
--- a/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_api_1_10_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 5eba73fd..00000000
--- a/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_manager_plexus_1_10_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index b3482ed2..00000000
--- a/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_cvs_commons_1_10_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 7b099315..00000000
--- a/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_cvsexe_1_10_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index a9220217..00000000
--- a/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_cvsjava_1_10_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 3c2ec946..00000000
--- a/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_git_commons_1_10_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index d8d5c7f6..00000000
--- a/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_gitexe_1_10_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 32ab75af..00000000
--- a/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_hg_1_10_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index f688fb67..00000000
--- a/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_perforce_1_10_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 6c9ed52b..00000000
--- a/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_starteam_1_10_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index ecc00787..00000000
--- a/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_svn_commons_1_10_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 74bb6961..00000000
--- a/.idea/libraries/Maven__org_apache_maven_scm_maven_scm_provider_svnexe_1_10_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index af48a508..00000000
--- a/.idea/libraries/Maven__org_apache_maven_shared_file_management_3_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 9240dc64..00000000
--- a/.idea/libraries/Maven__org_apache_maven_shared_maven_artifact_transfer_0_11_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index ebb5bd7a..00000000
--- a/.idea/libraries/Maven__org_apache_maven_shared_maven_common_artifact_filters_3_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index eae3a6af..00000000
--- a/.idea/libraries/Maven__org_apache_maven_shared_maven_dependency_analyzer_1_11_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 446ac4d0..00000000
--- a/.idea/libraries/Maven__org_apache_maven_shared_maven_dependency_tree_3_0_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index d33a5ad9..00000000
--- a/.idea/libraries/Maven__org_apache_maven_shared_maven_filtering_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index d70a3cfe..00000000
--- a/.idea/libraries/Maven__org_apache_maven_shared_maven_invoker_3_0_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 9e2d94f7..00000000
--- a/.idea/libraries/Maven__org_apache_maven_shared_maven_script_interpreter_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 86cb928e..00000000
--- a/.idea/libraries/Maven__org_apache_maven_shared_maven_shared_incremental_1_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 9a2d6781..00000000
--- a/.idea/libraries/Maven__org_apache_maven_shared_maven_shared_io_3_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 5e5dfacb..00000000
--- a/.idea/libraries/Maven__org_apache_maven_shared_maven_shared_jar_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 72af5712..00000000
--- a/.idea/libraries/Maven__org_apache_maven_shared_maven_shared_utils_3_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index d8756000..00000000
--- a/.idea/libraries/Maven__org_apache_maven_surefire_maven_surefire_common_2_22_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 256a2f23..00000000
--- a/.idea/libraries/Maven__org_apache_maven_surefire_surefire_api_2_22_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 33359d49..00000000
--- a/.idea/libraries/Maven__org_apache_maven_surefire_surefire_booter_2_22_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 01638dc2..00000000
--- a/.idea/libraries/Maven__org_apache_maven_surefire_surefire_logger_api_3_0_0_M4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 2a088776..00000000
--- a/.idea/libraries/Maven__org_apache_maven_surefire_surefire_report_parser_3_0_0_M4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index dfd9682a..00000000
--- a/.idea/libraries/Maven__org_apache_maven_wagon_wagon_http_lightweight_3_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index a44a6b80..00000000
--- a/.idea/libraries/Maven__org_apache_maven_wagon_wagon_http_shared_3_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 7d0e5776..00000000
--- a/.idea/libraries/Maven__org_apache_maven_wagon_wagon_provider_api_3_3_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 072320e0..00000000
--- a/.idea/libraries/Maven__org_apache_struts_struts_core_1_3_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 9674c05e..00000000
--- a/.idea/libraries/Maven__org_apache_struts_struts_taglib_1_3_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index e4c6c813..00000000
--- a/.idea/libraries/Maven__org_apache_struts_struts_tiles_1_3_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 1e88c55a..00000000
--- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_33.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 16bfd1eb..00000000
--- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_33.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index e61207b3..00000000
--- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_33.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 7a2914a6..00000000
--- a/.idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 2e6b0aaf..00000000
--- a/.idea/libraries/Maven__org_apache_velocity_velocity_tools_2_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 6e2ad19c..00000000
--- a/.idea/libraries/Maven__org_apache_ws_commons_ws_commons_util_1_0_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 0b28957e..00000000
--- a/.idea/libraries/Maven__org_apache_ws_xmlschema_xmlschema_core_2_0_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 72b979eb..00000000
--- a/.idea/libraries/Maven__org_apache_xbean_xbean_reflect_3_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index becccce2..00000000
--- a/.idea/libraries/Maven__org_apache_xmlrpc_xmlrpc_client_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 5e5138f6..00000000
--- a/.idea/libraries/Maven__org_apache_xmlrpc_xmlrpc_common_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index f854ab00..00000000
--- a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 1a387a4d..00000000
--- a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 6222cc89..00000000
--- a/.idea/libraries/Maven__org_assertj_assertj_core_3_13_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 5bad7db8..00000000
--- a/.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index d6f17aa7..00000000
--- a/.idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 23010542..00000000
--- a/.idea/libraries/Maven__org_checkerframework_checker_qual_2_10_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 29757ab9..00000000
--- a/.idea/libraries/Maven__org_codehaus_groovy_groovy_2_5_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index e7241d77..00000000
--- a/.idea/libraries/Maven__org_codehaus_groovy_groovy_all_2_4_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index f9419525..00000000
--- a/.idea/libraries/Maven__org_codehaus_groovy_groovy_ant_indy_3_0_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index f47f9d9e..00000000
--- a/.idea/libraries/Maven__org_codehaus_groovy_groovy_cli_picocli_2_5_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 21e0a9c2..00000000
--- a/.idea/libraries/Maven__org_codehaus_groovy_groovy_dateutil_indy_3_0_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index c766f4c9..00000000
--- a/.idea/libraries/Maven__org_codehaus_groovy_groovy_docgenerator_2_5_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 2deddd20..00000000
--- a/.idea/libraries/Maven__org_codehaus_groovy_groovy_groovydoc_2_5_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index f8bb14b8..00000000
--- a/.idea/libraries/Maven__org_codehaus_groovy_groovy_indy_3_0_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 1ca79e8e..00000000
--- a/.idea/libraries/Maven__org_codehaus_groovy_groovy_templates_2_5_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index bf3cf6e4..00000000
--- a/.idea/libraries/Maven__org_codehaus_groovy_groovy_xml_2_5_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 69a06d11..00000000
--- a/.idea/libraries/Maven__org_codehaus_plexus_plexus_archiver_4_2_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index ff6091fb..00000000
--- a/.idea/libraries/Maven__org_codehaus_plexus_plexus_classworlds_2_5_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 9afba754..00000000
--- a/.idea/libraries/Maven__org_codehaus_plexus_plexus_compiler_api_2_8_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index cb401bb1..00000000
--- a/.idea/libraries/Maven__org_codehaus_plexus_plexus_compiler_javac_2_8_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index c71fa920..00000000
--- a/.idea/libraries/Maven__org_codehaus_plexus_plexus_compiler_manager_2_8_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 3b757bb4..00000000
--- a/.idea/libraries/Maven__org_codehaus_plexus_plexus_component_annotations_2_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 1d0d67f2..00000000
--- a/.idea/libraries/Maven__org_codehaus_plexus_plexus_container_default_2_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 8a32cec9..00000000
--- a/.idea/libraries/Maven__org_codehaus_plexus_plexus_digest_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 95b0d3ca..00000000
--- a/.idea/libraries/Maven__org_codehaus_plexus_plexus_i18n_1_0_beta_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index cdb2d874..00000000
--- a/.idea/libraries/Maven__org_codehaus_plexus_plexus_interpolation_1_26.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index e73fe73a..00000000
--- a/.idea/libraries/Maven__org_codehaus_plexus_plexus_io_3_2_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index b6b0c8ec..00000000
--- a/.idea/libraries/Maven__org_codehaus_plexus_plexus_java_0_9_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 72b8083c..00000000
--- a/.idea/libraries/Maven__org_codehaus_plexus_plexus_mail_sender_api_1_0_alpha_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index dbe996ed..00000000
--- a/.idea/libraries/Maven__org_codehaus_plexus_plexus_mail_sender_javamail_1_0_alpha_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 7b8b6ee0..00000000
--- a/.idea/libraries/Maven__org_codehaus_plexus_plexus_mail_sender_simple_1_0_alpha_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index f36723b7..00000000
--- a/.idea/libraries/Maven__org_codehaus_plexus_plexus_resources_1_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 20854341..00000000
--- a/.idea/libraries/Maven__org_codehaus_plexus_plexus_utils_3_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 55403132..00000000
--- a/.idea/libraries/Maven__org_codehaus_plexus_plexus_velocity_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 3182f887..00000000
--- a/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index e14901f0..00000000
--- a/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_1_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 6c8b371c..00000000
--- a/.idea/libraries/Maven__org_dom4j_dom4j_2_1_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 459a75f7..00000000
--- a/.idea/libraries/Maven__org_eclipse_aether_aether_util_0_9_0_M2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 743982ea..00000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_4_27_v20200227.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 3fb3d904..00000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_4_27_v20200227.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index bae04e59..00000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_jetty_security_9_4_27_v20200227.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index e457ecc7..00000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_jetty_server_9_4_27_v20200227.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index b12e7736..00000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlet_9_4_27_v20200227.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 14568aa0..00000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_4_27_v20200227.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 2969b47d..00000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_jetty_webapp_9_4_27_v20200227.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 5e65e9d5..00000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_jetty_xml_9_4_27_v20200227.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index f0686c95..00000000
--- a/.idea/libraries/Maven__org_eclipse_mylyn_github_org_eclipse_egit_github_core_2_1_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index dd040299..00000000
--- a/.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index a0481f21..00000000
--- a/.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index b1702934..00000000
--- a/.idea/libraries/Maven__org_hamcrest_hamcrest_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 2456ee8d..00000000
--- a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 1fd775b5..00000000
--- a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_1_0_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index a81a97e0..00000000
--- a/.idea/libraries/Maven__org_hibernate_hibernate_core_5_4_12_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index d035d9cd..00000000
--- a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_18_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index b379bfa9..00000000
--- a/.idea/libraries/Maven__org_iq80_snappy_snappy_0_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index a9de551c..00000000
--- a/.idea/libraries/Maven__org_javassist_javassist_3_24_0_GA.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index a8bf3587..00000000
--- a/.idea/libraries/Maven__org_jboss_jandex_2_1_1_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 0b76247c..00000000
--- a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index de00ad0e..00000000
--- a/.idea/libraries/Maven__org_jsoup_jsoup_1_8_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 5db07403..00000000
--- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_5_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 8fbc8ce2..00000000
--- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_5_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index cca5485d..00000000
--- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_5_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index e2713d08..00000000
--- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_5_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 4192cdcd..00000000
--- a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_5_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index cbbd9b77..00000000
--- a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_5_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 38f7e124..00000000
--- a/.idea/libraries/Maven__org_jvnet_staxex_stax_ex_1_8_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index c18526d0..00000000
--- a/.idea/libraries/Maven__org_mockito_mockito_core_3_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index d4e66431..00000000
--- a/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 7d5819b6..00000000
--- a/.idea/libraries/Maven__org_mozilla_rhino_1_7_7_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index ec7897a1..00000000
--- a/.idea/libraries/Maven__org_netbeans_lib_cvsclient_20060125.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 90d8f2b4..00000000
--- a/.idea/libraries/Maven__org_nibor_autolink_autolink_0_6_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index af41e3b6..00000000
--- a/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index fbc1b163..00000000
--- a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 814416dd..00000000
--- a/.idea/libraries/Maven__org_ow2_asm_asm_7_3_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index ce864004..00000000
--- a/.idea/libraries/Maven__org_ow2_asm_asm_analysis_7_3_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 004af88f..00000000
--- a/.idea/libraries/Maven__org_ow2_asm_asm_commons_7_3_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 45cd3cdb..00000000
--- a/.idea/libraries/Maven__org_ow2_asm_asm_tree_7_3_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index c5fe2383..00000000
--- a/.idea/libraries/Maven__org_ow2_asm_asm_util_7_3_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index cac4cab0..00000000
--- a/.idea/libraries/Maven__org_postgresql_postgresql_42_2_11.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 46cf8a8e..00000000
--- a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_12.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index c4c54d6d..00000000
--- a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 27229ce3..00000000
--- a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 02b6812c..00000000
--- a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index e5856a03..00000000
--- a/.idea/libraries/Maven__org_slf4j_slf4j_simple_1_7_30.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 13888169..00000000
--- a/.idea/libraries/Maven__org_sonatype_aether_aether_api_1_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 508e3f40..00000000
--- a/.idea/libraries/Maven__org_sonatype_aether_aether_impl_1_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index d75c8379..00000000
--- a/.idea/libraries/Maven__org_sonatype_aether_aether_spi_1_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 47b2dc90..00000000
--- a/.idea/libraries/Maven__org_sonatype_aether_aether_util_1_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 9302938e..00000000
--- a/.idea/libraries/Maven__org_sonatype_plexus_plexus_build_api_0_0_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 7316193d..00000000
--- a/.idea/libraries/Maven__org_sonatype_plexus_plexus_cipher_1_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index bb61d0e6..00000000
--- a/.idea/libraries/Maven__org_sonatype_plexus_plexus_sec_dispatcher_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index b722b5a6..00000000
--- a/.idea/libraries/Maven__org_sonatype_sisu_sisu_guice_noaop_2_1_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 67fb8805..00000000
--- a/.idea/libraries/Maven__org_sonatype_sisu_sisu_inject_bean_1_4_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 714626a1..00000000
--- a/.idea/libraries/Maven__org_sonatype_sisu_sisu_inject_plexus_1_4_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 35e80377..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_2_6_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 5b60c93b..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_2_6_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index f4b65ce5..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_metadata_2_2_6_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index e93b2169..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_processor_2_2_6_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 4e3f6ef5..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_2_6_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 3056026f..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_loader_tools_2_2_6_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 47c45e48..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_maven_plugin_maven_plugin_2_2_6_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 3ab6e92b..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_properties_migrator_2_2_6_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 20e8b4f5..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_2_6_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 9c842573..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_2_6_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 0a32cfb0..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_2_6_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index f8b1c7cc..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_2_6_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 94147d6c..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_2_6_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index cee45df0..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_2_6_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index ea443310..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_mail_2_2_6_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 9b5f6b5e..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_2_2_6_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 5be67a68..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_2_6_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index a7b0e20f..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_2_6_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 960a99f2..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_2_6_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index fa682045..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_2_6_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 3e807b06..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_2_6_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index ea379592..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_2_6_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index c8fab5d5..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_2_6_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 6136f0d4..00000000
--- a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_2_6_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index b750d6eb..00000000
--- a/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_2_6_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index fb43499f..00000000
--- a/.idea/libraries/Maven__org_springframework_security_spring_security_config_5_2_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index a3510235..00000000
--- a/.idea/libraries/Maven__org_springframework_security_spring_security_core_5_2_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 61cd1b9e..00000000
--- a/.idea/libraries/Maven__org_springframework_security_spring_security_data_5_2_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 5c7cb883..00000000
--- a/.idea/libraries/Maven__org_springframework_security_spring_security_remoting_5_2_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 496d50ab..00000000
--- a/.idea/libraries/Maven__org_springframework_security_spring_security_test_5_2_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 2dd17f26..00000000
--- a/.idea/libraries/Maven__org_springframework_security_spring_security_web_5_2_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index da2f84dc..00000000
--- a/.idea/libraries/Maven__org_springframework_session_spring_session_core_2_2_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index f5405962..00000000
--- a/.idea/libraries/Maven__org_springframework_session_spring_session_jdbc_2_2_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 13397380..00000000
--- a/.idea/libraries/Maven__org_springframework_spring_aop_5_2_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 10a865f4..00000000
--- a/.idea/libraries/Maven__org_springframework_spring_aspects_5_2_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 97d38e86..00000000
--- a/.idea/libraries/Maven__org_springframework_spring_beans_5_2_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 65e18f73..00000000
--- a/.idea/libraries/Maven__org_springframework_spring_context_5_2_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 18538125..00000000
--- a/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 9901cb97..00000000
--- a/.idea/libraries/Maven__org_springframework_spring_core_5_2_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index dd19707e..00000000
--- a/.idea/libraries/Maven__org_springframework_spring_expression_5_2_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index b1ffa91a..00000000
--- a/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index cd9097ad..00000000
--- a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 05993e2c..00000000
--- a/.idea/libraries/Maven__org_springframework_spring_orm_5_2_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index ad47fa36..00000000
--- a/.idea/libraries/Maven__org_springframework_spring_test_5_2_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 97a3dce4..00000000
--- a/.idea/libraries/Maven__org_springframework_spring_tx_5_2_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 36a90f56..00000000
--- a/.idea/libraries/Maven__org_springframework_spring_web_5_2_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index a1ca211e..00000000
--- a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 7b246ae1..00000000
--- a/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_4_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index dbdddb53..00000000
--- a/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_springsecurity5_3_0_4_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 7b72babd..00000000
--- a/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_11_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 3370587a..00000000
--- a/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_11_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index c2307d66..00000000
--- a/.idea/libraries/Maven__org_thymeleaf_thymeleaf_testing_3_0_4_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 6f7b1fb2..00000000
--- a/.idea/libraries/Maven__org_tukaani_xz_1_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 2334aa05..00000000
--- a/.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 16ee44ef..00000000
--- a/.idea/libraries/Maven__org_webjars_bootstrap_4_4_1_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index a96e07af..00000000
--- a/.idea/libraries/Maven__org_webjars_ckeditor_4_14_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index c20b8df9..00000000
--- a/.idea/libraries/Maven__org_webjars_font_awesome_5_13_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 09b6eb41..00000000
--- a/.idea/libraries/Maven__org_webjars_jquery_3_4_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 52ae3e6c..00000000
--- a/.idea/libraries/Maven__org_webjars_popper_js_1_14_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 13230150..00000000
--- a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 495fc06f..00000000
--- a/.idea/libraries/Maven__org_yaml_snakeyaml_1_25.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 25203a04..00000000
--- a/.idea/libraries/Maven__oro_oro_2_0_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index ca0e345b..00000000
--- a/.idea/libraries/Maven__rome_rome_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index e8c78314..00000000
--- a/.idea/libraries/Maven__sslext_sslext_1_2_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 8310dc88..00000000
--- a/.idea/libraries/Maven__wsdl4j_wsdl4j_1_6_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index dd647b42..00000000
--- a/.idea/libraries/Maven__xalan_xalan_2_7_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 19d39dba..00000000
--- a/.idea/libraries/Maven__xerces_xercesImpl_2_9_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index c36e7171..00000000
--- a/.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index e96534fb..00000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
-
-
- -
-
-
- -
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/validation.xml b/.idea/validation.xml
deleted file mode 100644
index 8e86b7df..00000000
--- a/.idea/validation.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 35eb1ddf..94a25f7f 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..9eca8dfb
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,4 @@
+os: linux
+dist: bionic
+language: java
+jdk: openjdk11
diff --git a/README.md b/README.md
index c1b022ab..90e37732 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
# simpleworklist

+[](https://travis-ci.com/Spring-Framework-Java-Apps/simpleworklist)
Your Todo List for Getting Things Done
@@ -22,8 +23,8 @@ SimpleWorklist is not affiliated with or endorsed by the David Allen Company.
* [spring-framework-java-apps.github.io/simpleworklist](http://spring-framework-java-apps.github.io/simpleworklist/)
## Development
-* [Requirements](etc/requirements/Requirements.md)
-* [Nonfunctional_Requirements](etc/requirements/Nonfunctional_Requirements.md)
+* [Requirements](src/site/markdown/Requirements.md)
+* [Nonfunctional_Requirements](src/site/markdown/Nonfunctional_Requirements.md)
* [HOWTO](etc/development/HOWTO.md)
* [Maven_Plugins](etc/development/Maven_Plugins.md)
* [Primesfaces_JSF](etc/development/Primesfaces_JSF.md)
diff --git a/etc/TODO.md b/etc/TODO.md
index 3384ab8d..e907dfbd 100644
--- a/etc/TODO.md
+++ b/etc/TODO.md
@@ -109,4 +109,6 @@ Fixed #128, Fixed #192, Fixed #193, Fixed #194, Fixed #195, Fixed #196, Fixed #1
Fixed #241, Fixed #242, Fixed #243, Fixed #252
#2.3.20
+Update Spring-Boot to 2.3.0 #255
+Fixed #255 - working on: Update Spring-Boot to 2.3.0
diff --git a/etc/requirements/Nonfunctional_Requirements.md b/etc/requirements/Nonfunctional_Requirements.md
deleted file mode 100644
index 2fa851dd..00000000
--- a/etc/requirements/Nonfunctional_Requirements.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# Nonfunctional Requirements
-
-## NF001 Runtime Components
-### PostgreSQL Database
-### PostgreSQL Database CLI
-### Embedded java Servlet Container (Apache Tomcat)
-### spring-boot
-### spring-boot-web
-### spring-boot-jpa
-### spring-session-jdbc
-## NF002 Development Systems: Local Machine
-### Windows10
-### Linux
-### bash
-### git
-### java
-### maven
-### Database PostgreSQL
-#### Docker
-#### Local Service
-### IDE
-#### IntelliJ
-#### SpringToolSuite in Eclipse
-## NF003 Development Systems: Github
-## NF004 Development Systems: Continous Integration Service
-## NF004 Development Systems: Heroku
-## NF005 Continous Integration: Spring/Maven Unit and Integration Tests
-## NF007 Deployment on Heroku
-## NF007 Deployment on Heroku: Database Schema Changes
-
diff --git a/etc/serialversions/getserialversionid.cmd b/etc/serialversions/getserialversionid.cmd
index 6d3bf39b..6258ec23 100644
--- a/etc/serialversions/getserialversionid.cmd
+++ b/etc/serialversions/getserialversionid.cmd
@@ -16,31 +16,31 @@ set CLASSPATH=%MY_CLASSPATH_APP%;%MY_CLASSPATH_DEPS%
echo %CLASSPATH%
cd target\classes
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.domain.task.TaskEnergy >> ..\..\etc\serialversions.txt
+serialver org.woehlke.simpleworklist.domain.task.TaskState >> ..\..\etc\serialversions.txt
+serialver org.woehlke.simpleworklist.domain.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.application.common.AuditModel >> ..\..\etc\serialversions.txt
-serialver org.woehlke.simpleworklist.context.Context >> ..\..\etc\serialversions.txt
-serialver org.woehlke.simpleworklist.project.Project >> ..\..\etc\serialversions.txt
-serialver org.woehlke.simpleworklist.task.Task >> ..\..\etc\serialversions.txt
+serialver org.woehlke.simpleworklist.domain.context.Context >> ..\..\etc\serialversions.txt
+serialver org.woehlke.simpleworklist.domain.project.Project >> ..\..\etc\serialversions.txt
+serialver org.woehlke.simpleworklist.domain.task.Task >> ..\..\etc\serialversions.txt
serialver org.woehlke.simpleworklist.user.chat.User2UserMessage >> ..\..\etc\serialversions.txt
serialver org.woehlke.simpleworklist.user.account.UserAccount >> ..\..\etc\serialversions.txt
serialver org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecovery >> ..\..\etc\serialversions.txt
serialver org.woehlke.simpleworklist.user.register.UserRegistration >> ..\..\etc\serialversions.txt
-serialver org.woehlke.simpleworklist.application.breadcrumb.BreadcrumbItem >> ..\..\etc\serialversions.txt
-serialver org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb >> ..\..\etc\serialversions.txt
+serialver org.woehlke.simpleworklist.domain.breadcrumb.BreadcrumbItem >> ..\..\etc\serialversions.txt
+serialver org.woehlke.simpleworklist.domain.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.domain.context.NewContextForm >> ..\..\etc\serialversions.txt
serialver org.woehlke.simpleworklist.user.chat.User2UserMessageFormBean >> ..\..\etc\serialversions.txt
serialver org.woehlke.simpleworklist.searchRequest.SearchResult >> ..\..\etc\serialversions.txt
serialver org.woehlke.simpleworklist.user.account.UserAccountForm >> ..\..\etc\serialversions.txt
-serialver org.woehlke.simpleworklist.context.UserChangeDefaultContextForm >> ..\..\etc\serialversions.txt
+serialver org.woehlke.simpleworklist.user.account.UserChangeDefaultContextForm >> ..\..\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
+serialver org.woehlke.simpleworklist.user.account.UserChangeNameForm >> ..\..\etc\serialversions.txt
+serialver org.woehlke.simpleworklist.user.account.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.user.session.UserSessionBean >> ..\..\etc\serialversions.txt
diff --git a/etc/serialversions/serialversions.txt b/etc/serialversions/serialversions.txt
index c0eee59b..5ef74d2f 100644
--- a/etc/serialversions/serialversions.txt
+++ b/etc/serialversions/serialversions.txt
@@ -1,28 +1,28 @@
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.domain.task.TaskEnergy: private static final long serialVersionUID = 0L;
+org.woehlke.simpleworklist.domain.task.TaskState: private static final long serialVersionUID = 0L;
+org.woehlke.simpleworklist.domain.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.application.common.AuditModel: private static final long serialVersionUID = 4399373914714726911L;
-org.woehlke.simpleworklist.context.Context: private static final long serialVersionUID = -5035732370606951871L;
-org.woehlke.simpleworklist.project.Project: private static final long serialVersionUID = 4566653175832872422L;
-org.woehlke.simpleworklist.task.Task: private static final long serialVersionUID = 5247710652586269801L;
+org.woehlke.simpleworklist.domain.context.Context: private static final long serialVersionUID = -5035732370606951871L;
+org.woehlke.simpleworklist.domain.project.Project: private static final long serialVersionUID = 4566653175832872422L;
+org.woehlke.simpleworklist.domain.task.Task: private static final long serialVersionUID = 5247710652586269801L;
org.woehlke.simpleworklist.user.chat.User2UserMessage: private static final long serialVersionUID = 4263078228257938175L;
org.woehlke.simpleworklist.user.account.UserAccount: private static final long serialVersionUID = 7860692526488291439L;
org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecovery: private static final long serialVersionUID = 6860716425733119940L;
org.woehlke.simpleworklist.user.register.UserRegistration: private static final long serialVersionUID = -1955967514018161878L;
-org.woehlke.simpleworklist.application.breadcrumb.BreadcrumbItem: private static final long serialVersionUID = 8276819198016077167L;
-org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb: private static final long serialVersionUID = 7932703111140692689L;
+org.woehlke.simpleworklist.domain.breadcrumb.BreadcrumbItem: private static final long serialVersionUID = 8276819198016077167L;
+org.woehlke.simpleworklist.domain.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.domain.context.NewContextForm: private static final long serialVersionUID = -937143305653156981L;
org.woehlke.simpleworklist.user.chat.User2UserMessageFormBean: private static final long serialVersionUID = 1576610181966480168L;
org.woehlke.simpleworklist.searchRequest.SearchResult: private static final long serialVersionUID = 1682809351146047764L;
org.woehlke.simpleworklist.user.account.UserAccountForm: private static final long serialVersionUID = 9180383385243540190L;
-org.woehlke.simpleworklist.context.UserChangeDefaultContextForm: private static final long serialVersionUID = -8592295563275083292L;
+org.woehlke.simpleworklist.user.account.UserChangeDefaultContextForm: private static final long serialVersionUID = -8592295563275083292L;
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.account.UserChangeNameForm: private static final long serialVersionUID = 5120488382888268418L;
+org.woehlke.simpleworklist.user.account.UserChangePasswordForm: private static final long serialVersionUID = 9149342594823222054L;
org.woehlke.simpleworklist.user.register.UserRegistrationForm: private static final long serialVersionUID = 6864871862706880939L;
org.woehlke.simpleworklist.user.session.UserSessionBean: private static final long serialVersionUID = -6649686058228455825L;
diff --git a/etc/uml/SimpleWorklist.mdzip b/etc/uml/SimpleWorklist.mdzip
deleted file mode 100644
index fded3e75..00000000
Binary files a/etc/uml/SimpleWorklist.mdzip and /dev/null differ
diff --git a/etc/uml/SimpleWorklist.mdzip.bak b/etc/uml/SimpleWorklist.mdzip.bak
deleted file mode 100644
index 828e6914..00000000
Binary files a/etc/uml/SimpleWorklist.mdzip.bak and /dev/null differ
diff --git a/pom.xml b/pom.xml
index ca82c615..e371173d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,18 +2,20 @@
4.0.0
- org.woehlke
- simpleworklist
- 2.3.20-SNAPSHOT
- jar
org.springframework.boot
spring-boot-starter-parent
- 2.2.6.RELEASE
+ 2.3.2.RELEASE
+ org.woehlke
+ simpleworklist
+ 2.3.23-SNAPSHOT
+ jar
+
simpleworklist
Your Todo-List for Getting Things Done
+
https://woehlke.org/p/simpleworklist
2012
@@ -21,6 +23,7 @@
Spring-Framework-Java-Apps
https://github.com/Spring-Framework-Java-Apps/
+
Thomas Wöhlke
@@ -29,16 +32,25 @@
+
+
+ Apache License, Version 2.0
+ http://www.apache.org/licenses/LICENSE-2.0
+
+
+
- https://github.com/Spring-Framework-Java-Apps/simpleworklist.git
scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git
scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git
- HEAD
+ https://github.com/Spring-Framework-Java-Apps/simpleworklist/tree/${project.scm.tag}
+ master
+
Github
https://github.com/Spring-Framework-Java-Apps/simpleworklist/issues
+
simpleworklist.public_html
@@ -46,67 +58,50 @@
-
- 1.8
+ 11
3.6.3
- 2.2.1
- ${project.parent.version}
-
- 1.11.2
- 2.5.3
- 2.8.2
+
+
+ 1.11.2
+ 3.0.0-M1
+ 3.0.0-M1
+
1.8
- 3.1.1
+ 3.3.0
3.1.0
3.8.1
3.1.2
- 2.8.2
3.0.0-M3
2.22.2
3.2.0
2.5.2
3.2.1
- 3.1.2
- 3.1.1
+ 3.2.0
+ 3.2.0
3.1.0
3.2.2
- 3.9.0
- 3.1.0
+ 3.2.1
2.22.2
- 3.2.3
+ 3.3.1
2.7
1.0.2
- 1.0.9.RELEASE
+ 1.2.1.RELEASE
3.0.1
2.12.1
- 3.0.11.RELEASE
- 2.0.1
- 3.0.4.RELEASE
- 3.0.4.RELEASE
- 2.4.1
-
- Moore-SR6
- 5.2.5.RELEASE
- 5.2.2.RELEASE
- Corn-SR2
-
- 5.5.2
- 2.6.4
- 2.36.0
- 2.1
- 1.18.12
-
- 3.0.0
+ 3.1.0
3.1.1
3.0.0
- 3.11.0
- 4.0.0
3.13.0
- 3.0.0-M4
+ 4.0.4
+ 1.9.1
+ 3.13.0
+ 3.0.0-M5
+ 3.9.1
+ 1.9.1
4.0.0
@@ -114,9 +109,174 @@
true
true
+
+ 3.4.1
+ 4.4.1-1
+ 5.13.0
+ 4.14.0
+
+
+ 3.0.11.RELEASE
+ 3.4.0
+ 2.0.1
+ 2.4.1
+ 3.0.4.RELEASE
+ 3.0.4.RELEASE
+ 3.0.4.RELEASE
+
+
+ ${project.parent.version}
+ Dragonfruit-RELEASE
+ Neumann-RELEASE
+ 5.2.6.RELEASE
+ 5.3.2.RELEASE
+ 2.2.1
+
+
+ 5.6.2
+ 2.6.4
+ 2.6.4
+ 2.40.0
+ 2.2
+ 1.18.12
+ 1.13.1
+
true
+
+
+ jcenter
+ JCenter Repository
+ https://jcenter.bintray.com/
+
+
+ central
+ Central
+ https://repo1.maven.org/maven2/
+
+
+ sonatype-releases
+ Sonatype Repository
+ https://oss.sonatype.org/content/repositories/releases/
+
+
+ springio-plugins-release
+ Spring Plugins Repository
+ https://repo.spring.io/plugins-release/
+
+
+ springio-libs-release
+ Spring Lib Release Repository
+ https://repo.spring.io/libs-release/
+
+
+ spring-libs-milestone
+ Spring Lib M Repository
+ https://repo.spring.io/libs-milestone/
+
+
+ atlassian-public
+ Atlassian Repository
+ https://maven.atlassian.com/content/repositories/atlassian-public/
+
+
+ jboss-releases
+ JBoss Releases Repository
+ https://repository.jboss.org/nexus/content/repositories/releases/
+
+
+ jboss-ea
+ JBossEA Repository
+ https://repository.jboss.org/nexus/content/repositories/ea/
+
+
+ wso2-public
+ WSO2 Public Repository
+ https://maven.wso2.org/nexus/content/repositories/public/
+
+
+ hortonworks-releases
+ Hortonworks Repository
+ https://repo.hortonworks.com/content/repositories/releases/
+
+
+ adobe-public
+ AdobePublic Repository
+ https://repo.adobe.com/nexus/content/repositories/public/
+
+
+
+
+ jcenter
+ JCenter Repository
+ https://jcenter.bintray.com/
+
+
+ central
+ Central
+ https://repo1.maven.org/maven2/
+
+
+ sonatype-releases
+ Sonatype Repository
+ https://oss.sonatype.org/content/repositories/releases/
+
+
+ springio-plugins-release
+ Spring Plugins Repository
+ https://repo.spring.io/plugins-release/
+
+
+ springio-libs-release
+ Spring Lib Release Repository
+ https://repo.spring.io/libs-release/
+
+
+ spring-libs-milestone
+ Spring Lib M Repository
+ https://repo.spring.io/libs-milestone/
+
+
+ spring-snapshots
+ https://repo.spring.io/snapshot
+
+
+ spring-milestones
+ https://repo.spring.io/milestone
+
+
+ atlassian-public
+ Atlassian Repository
+ https://maven.atlassian.com/content/repositories/atlassian-public/
+
+
+ jboss-releases
+ JBoss Releases Repository
+ https://repository.jboss.org/nexus/content/repositories/releases/
+
+
+ jboss-ea
+ JBossEA Repository
+ https://repository.jboss.org/nexus/content/repositories/ea/
+
+
+ wso2-public
+ WSO2 Public Repository
+ https://maven.wso2.org/nexus/content/repositories/public/
+
+
+ hortonworks-releases
+ Hortonworks Repository
+ https://repo.hortonworks.com/content/repositories/releases/
+
+
+ adobe-public
+ AdobePublic Repository
+ https://repo.adobe.com/nexus/content/repositories/public/
+
+
+
@@ -126,29 +286,6 @@
pom
import
-
org.springframework.session
spring-session-bom
@@ -156,63 +293,40 @@
pom
import
-
+
org.webjars
jquery
- 3.4.1
+ ${webjars.jquery.version}
org.webjars
bootstrap
- 4.4.1-1
+ ${webjars.bootstrap.version}
org.webjars
font-awesome
- 5.13.0
+ ${webjars.font-awesome.version}
org.webjars
ckeditor
- 4.14.0
+ ${webjars.ckeditor.version}
-
+
org.thymeleaf
thymeleaf-testing
- 3.0.4.RELEASE
+ ${thymeleaf-testing.version}
test
-
io.github.jpenren
thymeleaf-spring-data-dialect
- 3.4.0
+ ${thymeleaf-spring-data-dialect.version}
-
+
org.projectlombok
lombok
@@ -223,7 +337,7 @@
org.jsoup
jsoup
- 1.8.3
+ ${jsoup.version}
@@ -342,6 +456,27 @@
${maven-changes-plugin.version}
maven-plugin
+
+ org.apache.maven.plugins
+ maven-release-plugin
+ ${maven-release-plugin.version}
+ maven-plugin
+
+
+ org.apache.maven.doxia
+ doxia-module-markdown
+ ${doxia-module-markdown.version}
+
+
+ org.xmlunit
+ xmlunit-core
+ ${xmlunit.version}
+
+
+ net.sourceforge.htmlunit
+ htmlunit
+ ${htmlunit.version}
+
@@ -587,6 +722,15 @@
maven-changes-plugin
maven-plugin
+
+ org.apache.maven.plugins
+ maven-release-plugin
+ maven-plugin
+
+
+ org.apache.maven.doxia
+ doxia-module-markdown
+
@@ -639,6 +783,63 @@
maven-surefire-report-plugin
${maven-surefire-report-plugin.version}
+
+ org.apache.maven.plugins
+ maven-release-plugin
+ ${maven-release-plugin.version}
+
+
+ org.apache.maven.plugins
+ maven-deploy-plugin
+ ${maven-deploy-plugin.version}
+
+
+ org.apache.maven.plugins
+ maven-site-plugin
+ ${maven-site-plugin.version}
+
+
+ org.apache.maven.doxia
+ doxia-module-markdown
+ ${doxia-module.version}
+
+
+ org.apache.maven.doxia
+ doxia-module-itext
+ ${doxia-module.version}
+
+
+ org.apache.maven.doxia
+ doxia-module-latex
+ ${doxia-module.version}
+
+
+ org.apache.maven.doxia
+ doxia-module-rtf
+ ${doxia-module.version}
+
+
+ org.apache.maven.doxia
+ doxia-module-xdoc
+ ${doxia-module.version}
+
+
+ org.apache.maven.doxia
+ doxia-skin-model
+ ${doxia-module.version}
+
+
+ org.apache.maven.doxia
+ doxia-site-renderer
+ ${doxia-module.version}
+
+
+ org.apache.maven.doxia
+ doxia-test-docs
+ ${doxia-module.version}
+
+
+
@@ -658,25 +859,45 @@
org.apache.maven.plugins:maven-verifier-plugin
- Please consider using the maven-invoker-plugin (http://maven.apache.org/plugins/maven-invoker-plugin/)!
+
+ Please consider using the maven-invoker-plugin
+ (http://maven.apache.org/plugins/maven-invoker-plugin/)!
+
+
${version.maven}
+
${java.version}
-
+ ${project.basedir}/etc/psql.sh
+ ${project.basedir}/etc/docker-start.sh
+ ${project.basedir}/etc/docker-stop.sh
+ ${project.basedir}/etc/db/db-createdb-and-user-linux.sql
+ ${project.basedir}/etc/db/db-createdb-and-user-win10.sql
- -->
@@ -701,43 +922,6 @@
-
- com.dkanejs.maven.plugins
- docker-compose-maven-plugin
-
- ${project.basedir}/docker-compose.yml
- ${docker-compose-maven-plugin.verbose}
- ${docker-compose-maven-plugin.removeImages}
- true
- true
- true
-
-
-
- org.apache.maven.plugins
- maven-clean-plugin
-
-
- org.apache.maven.plugins
- maven-install-plugin
-
-
- org.apache.maven.plugins
- maven-help-plugin
-
-
- org.apache.maven.plugins
- maven-source-plugin
-
-
- org.apache.maven.plugins
- maven-javadoc-plugin
-
- true
- 1024m
- ${java.version}
-
-
org.springframework.boot
spring-boot-maven-plugin
@@ -745,26 +929,6 @@
true
-
id-build-info
@@ -781,6 +945,18 @@
+
+ com.dkanejs.maven.plugins
+ docker-compose-maven-plugin
+
+ ${project.basedir}/docker-compose.yml
+ ${docker-compose-maven-plugin.verbose}
+ ${docker-compose-maven-plugin.removeImages}
+ true
+ true
+ true
+
+
org.apache.maven.plugins
maven-dependency-plugin
@@ -805,15 +981,9 @@
true
${project.build.outputDirectory}/classpath.txt
false
+ java-source,jar
org.apache.maven.plugins:maven-surefire-plugin
-
org.apache.maven.plugins:maven-surefire-plugin
@@ -865,6 +1035,22 @@
+
+ get-dependency-classes
+ site
+
+ resolve
+ resolve-plugins
+ collect
+ copy-dependencies
+ unpack-dependencies
+
+
+ jar
+ false
+ ${project.build.directory}/dependency-classes/
+
+
get-dependency-sources
site
@@ -877,9 +1063,9 @@
unpack-dependencies
- sources
- org.webjars
- weld-probe-core
+ java-source
+ org.webjars,antlr,org.beanshell,org.apache.velocity
+ weld-probe-core,antlr,bsh,velocity-tools
false
${project.build.directory}/dependency-sources/
@@ -900,6 +1086,56 @@
true
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+
+ true
+ 1024m
+ ${java.version}
+
+
+
+ org.apache.maven.plugins
+ maven-jxr-plugin
+
+ true
+
+
+
+ org.apache.maven.plugins
+ maven-clean-plugin
+
+
+ org.apache.maven.plugins
+ maven-install-plugin
+
+
+ org.apache.maven.plugins
+ maven-help-plugin
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+
+
+ org.apache.maven.plugins
+ maven-site-plugin
+
+
+ org.apache.maven.plugins
+ maven-release-plugin
+
+ v@{project.version}
+
+
+
+ org.apache.maven.plugins
+ maven-deploy-plugin
+
+ true
+
+
org.apache.maven.plugins
maven-surefire-plugin
@@ -927,33 +1163,36 @@
+
org.apache.maven.plugins
maven-enforcer-plugin
+ true
org.apache.maven.plugins
maven-invoker-plugin
-
- ${project.build.directory}/it
- src/it/settings.xml
- ${project.build.directory}/it-repo
- verify
-
+ true
org.springframework.boot
spring-boot-maven-plugin
+ true
true
- org.apache.maven.plugins
- maven-project-info-reports-plugin
+ com.dkanejs.maven.plugins
+ docker-compose-maven-plugin
+ true
- true
- true
+ ${project.basedir}/docker-compose.yml
+ ${docker-compose-maven-plugin.verbose}
+ ${docker-compose-maven-plugin.removeImages}
+ true
+ true
+ true
@@ -963,23 +1202,17 @@
org.apache.maven.plugins
- maven-changes-plugin
+ maven-compiler-plugin
- https
- 443
+ ${java.version}
+ ${java.version}
+ ${project.build.sourceEncoding}
+
+ -Xlint:all,-options,-path
+
+ true
+ true
-
-
- id-github-report
-
- github-report
-
-
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
org.apache.maven.plugins
@@ -999,34 +1232,23 @@
org.apache.maven.plugins
- maven-checkstyle-plugin
-
- true
- true
- true
- false
- false
-
+ maven-clean-plugin
-
- com.github.spotbugs
- spotbugs-maven-plugin
-
- false
- true
- true
-
+
+ org.apache.maven.plugins
+ maven-install-plugin
org.apache.maven.plugins
- maven-pmd-plugin
-
- 100
- ${java.version}
-
- target
-
-
+ maven-help-plugin
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+
+
+ org.apache.maven.plugins
+ maven-site-plugin
org.apache.maven.plugins
@@ -1057,9 +1279,61 @@
+
org.apache.maven.plugins
- maven-site-plugin
+ maven-project-info-reports-plugin
+
+ true
+ true
+
+
+
+ org.apache.maven.plugins
+ maven-changes-plugin
+
+ https
+ 443
+
+
+
+ id-github-report
+
+ github-report
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ true
+ true
+ true
+ false
+ false
+
+
+
+ com.github.spotbugs
+ spotbugs-maven-plugin
+
+ false
+ true
+ true
+
+
+
+ org.apache.maven.plugins
+ maven-pmd-plugin
+
+ 100
+ ${java.version}
+
+ target
+
+
org.apache.maven.plugins
diff --git a/run.sh b/run.sh
index 711b04d3..33a7c8b2 100755
--- a/run.sh
+++ b/run.sh
@@ -2,6 +2,14 @@
source etc/setenv.sh
+function composeUp() {
+ ./mvnw docker-compose:up
+}
+
+function composeDown() {
+ ./mvnw docker-compose:down
+}
+
function runDev() {
./mvnw
}
@@ -53,8 +61,13 @@ function run() {
runDev
}
+function release() {
+ ./mvnw -B -DskipTests release:prepare && ./mvnw -B -DskipTests release:perform && ./mvnw -B -DskipTests release:clean
+}
+
function main() {
- #build
+ #release
+ build
run
}
diff --git a/src/main/java/org/woehlke/simpleworklist/application/breadcrumb/BreadcrumbServiceTest.java b/src/main/java/org/woehlke/simpleworklist/application/breadcrumb/BreadcrumbServiceTest.java
deleted file mode 100644
index e2911460..00000000
--- a/src/main/java/org/woehlke/simpleworklist/application/breadcrumb/BreadcrumbServiceTest.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.woehlke.simpleworklist.application.breadcrumb;
-
-public class BreadcrumbServiceTest {
-}
diff --git a/src/main/java/org/woehlke/simpleworklist/application/breadcrumb/BreadcrumbService.java b/src/main/java/org/woehlke/simpleworklist/application/breadcrumb/services/BreadcrumbService.java
similarity index 77%
rename from src/main/java/org/woehlke/simpleworklist/application/breadcrumb/BreadcrumbService.java
rename to src/main/java/org/woehlke/simpleworklist/application/breadcrumb/services/BreadcrumbService.java
index 18a9fb4b..21b7fb50 100644
--- a/src/main/java/org/woehlke/simpleworklist/application/breadcrumb/BreadcrumbService.java
+++ b/src/main/java/org/woehlke/simpleworklist/application/breadcrumb/services/BreadcrumbService.java
@@ -1,9 +1,10 @@
-package org.woehlke.simpleworklist.application.breadcrumb;
+package org.woehlke.simpleworklist.application.breadcrumb.services;
-import org.woehlke.simpleworklist.context.Context;
-import org.woehlke.simpleworklist.project.Project;
-import org.woehlke.simpleworklist.task.Task;
-import org.woehlke.simpleworklist.task.TaskState;
+import org.woehlke.simpleworklist.domain.breadcrumb.Breadcrumb;
+import org.woehlke.simpleworklist.domain.context.Context;
+import org.woehlke.simpleworklist.domain.project.Project;
+import org.woehlke.simpleworklist.domain.task.Task;
+import org.woehlke.simpleworklist.domain.task.TaskState;
import java.util.Locale;
diff --git a/src/main/java/org/woehlke/simpleworklist/application/breadcrumb/BreadcrumbServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/application/breadcrumb/services/BreadcrumbServiceImpl.java
similarity index 96%
rename from src/main/java/org/woehlke/simpleworklist/application/breadcrumb/BreadcrumbServiceImpl.java
rename to src/main/java/org/woehlke/simpleworklist/application/breadcrumb/services/BreadcrumbServiceImpl.java
index 59edd837..0c65a5dc 100644
--- a/src/main/java/org/woehlke/simpleworklist/application/breadcrumb/BreadcrumbServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/application/breadcrumb/services/BreadcrumbServiceImpl.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.breadcrumb;
+package org.woehlke.simpleworklist.application.breadcrumb.services;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -6,10 +6,11 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
-import org.woehlke.simpleworklist.context.Context;
-import org.woehlke.simpleworklist.project.Project;
-import org.woehlke.simpleworklist.task.Task;
-import org.woehlke.simpleworklist.task.TaskState;
+import org.woehlke.simpleworklist.domain.breadcrumb.Breadcrumb;
+import org.woehlke.simpleworklist.domain.context.Context;
+import org.woehlke.simpleworklist.domain.project.Project;
+import org.woehlke.simpleworklist.domain.task.Task;
+import org.woehlke.simpleworklist.domain.task.TaskState;
import java.util.Locale;
import java.util.Stack;
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 8a94f239..2c1452b6 100644
--- a/src/main/java/org/woehlke/simpleworklist/application/common/AbstractController.java
+++ b/src/main/java/org/woehlke/simpleworklist/application/common/AbstractController.java
@@ -4,24 +4,24 @@
import org.springframework.validation.BindingResult;
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.breadcrumb.services.BreadcrumbService;
import org.woehlke.simpleworklist.application.ApplicationProperties;
-import org.woehlke.simpleworklist.context.Context;
-import org.woehlke.simpleworklist.project.Project;
-import org.woehlke.simpleworklist.task.TaskService;
-import org.woehlke.simpleworklist.task.TaskState;
+import org.woehlke.simpleworklist.domain.context.Context;
+import org.woehlke.simpleworklist.domain.project.Project;
+import org.woehlke.simpleworklist.services.TaskService;
+import org.woehlke.simpleworklist.domain.task.TaskState;
import org.woehlke.simpleworklist.user.account.UserAccount;
-import org.woehlke.simpleworklist.task.TaskEnergy;
-import org.woehlke.simpleworklist.task.TaskTime;
-import org.woehlke.simpleworklist.context.ContextService;
-import org.woehlke.simpleworklist.project.ProjectService;
-import org.woehlke.simpleworklist.user.chat.User2UserMessageService;
-import org.woehlke.simpleworklist.user.account.UserAccountService;
+import org.woehlke.simpleworklist.domain.task.TaskEnergy;
+import org.woehlke.simpleworklist.domain.task.TaskTime;
+import org.woehlke.simpleworklist.services.ContextService;
+import org.woehlke.simpleworklist.services.ProjectService;
+import org.woehlke.simpleworklist.user.services.User2UserMessageService;
+import org.woehlke.simpleworklist.user.services.UserAccountService;
import org.woehlke.simpleworklist.user.session.UserSessionBean;
import org.springframework.beans.factory.annotation.Autowired;
-import org.woehlke.simpleworklist.user.account.UserAccountAccessService;
-import org.woehlke.simpleworklist.user.login.UserAccountLoginSuccessService;
+import org.woehlke.simpleworklist.user.services.UserAccountAccessService;
+import org.woehlke.simpleworklist.user.services.UserAccountLoginSuccessService;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/org/woehlke/simpleworklist/application/config/WebSecurityConfig.java b/src/main/java/org/woehlke/simpleworklist/application/config/WebSecurityConfig.java
index e4bba3e2..05f3d7b6 100644
--- a/src/main/java/org/woehlke/simpleworklist/application/config/WebSecurityConfig.java
+++ b/src/main/java/org/woehlke/simpleworklist/application/config/WebSecurityConfig.java
@@ -20,9 +20,8 @@
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
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;
+import org.woehlke.simpleworklist.user.services.UserAccountSecurityService;
@Configuration
diff --git a/src/main/java/org/woehlke/simpleworklist/application/error/MyErrorControllerTest.java b/src/main/java/org/woehlke/simpleworklist/application/error/MyErrorControllerTest.java
deleted file mode 100644
index 5df6a75d..00000000
--- a/src/main/java/org/woehlke/simpleworklist/application/error/MyErrorControllerTest.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.woehlke.simpleworklist.application.error;
-
-public class MyErrorControllerTest {
-}
diff --git a/src/main/java/org/woehlke/simpleworklist/application/listener/ContextRefreshedListener.java b/src/main/java/org/woehlke/simpleworklist/application/listener/ContextRefreshedListener.java
index d0489db4..d0357508 100644
--- a/src/main/java/org/woehlke/simpleworklist/application/listener/ContextRefreshedListener.java
+++ b/src/main/java/org/woehlke/simpleworklist/application/listener/ContextRefreshedListener.java
@@ -6,7 +6,7 @@
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.stereotype.Component;
-import org.woehlke.simpleworklist.search.SearchService;
+import org.woehlke.simpleworklist.services.SearchService;
/**
diff --git a/src/main/java/org/woehlke/simpleworklist/application/listener/ContextStartedListener.java b/src/main/java/org/woehlke/simpleworklist/application/listener/ContextStartedListener.java
index ab6743a6..9fba30f9 100644
--- a/src/main/java/org/woehlke/simpleworklist/application/listener/ContextStartedListener.java
+++ b/src/main/java/org/woehlke/simpleworklist/application/listener/ContextStartedListener.java
@@ -5,7 +5,7 @@
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ContextStartedEvent;
import org.springframework.stereotype.Component;
-import org.woehlke.simpleworklist.search.SearchService;
+import org.woehlke.simpleworklist.services.SearchService;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataController.java b/src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataController.java
index b9feebc3..07e1d01f 100644
--- a/src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataController.java
+++ b/src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataController.java
@@ -4,10 +4,11 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.woehlke.simpleworklist.application.testdata.services.TestDataService;
import org.woehlke.simpleworklist.user.account.UserAccount;
import org.springframework.beans.factory.annotation.Autowired;
-import org.woehlke.simpleworklist.user.login.UserAccountLoginSuccessService;
+import org.woehlke.simpleworklist.user.services.UserAccountLoginSuccessService;
@Slf4j
@Controller
diff --git a/src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataService.java b/src/main/java/org/woehlke/simpleworklist/application/testdata/services/TestDataService.java
similarity index 72%
rename from src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataService.java
rename to src/main/java/org/woehlke/simpleworklist/application/testdata/services/TestDataService.java
index dad58486..ef5a7ba7 100644
--- a/src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataService.java
+++ b/src/main/java/org/woehlke/simpleworklist/application/testdata/services/TestDataService.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.testdata;
+package org.woehlke.simpleworklist.application.testdata.services;
import org.woehlke.simpleworklist.user.account.UserAccount;
diff --git a/src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/application/testdata/services/TestDataServiceImpl.java
similarity index 99%
rename from src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataServiceImpl.java
rename to src/main/java/org/woehlke/simpleworklist/application/testdata/services/TestDataServiceImpl.java
index 01d1c06f..50192c69 100644
--- a/src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/application/testdata/services/TestDataServiceImpl.java
@@ -1,24 +1,22 @@
-package org.woehlke.simpleworklist.application.testdata;
+package org.woehlke.simpleworklist.application.testdata.services;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
-import org.woehlke.simpleworklist.context.Context;
-import org.woehlke.simpleworklist.project.Project;
-import org.woehlke.simpleworklist.task.Task;
-import org.woehlke.simpleworklist.task.TaskEnergy;
-import org.woehlke.simpleworklist.task.TaskState;
+import org.woehlke.simpleworklist.domain.context.Context;
+import org.woehlke.simpleworklist.domain.project.Project;
+import org.woehlke.simpleworklist.domain.task.Task;
+import org.woehlke.simpleworklist.domain.task.TaskEnergy;
+import org.woehlke.simpleworklist.domain.task.TaskState;
import org.woehlke.simpleworklist.user.account.UserAccount;
-import org.woehlke.simpleworklist.task.TaskTime;
-import org.woehlke.simpleworklist.context.ContextRepository;
-import org.woehlke.simpleworklist.task.TaskRepository;
-import org.woehlke.simpleworklist.project.ProjectRepository;
+import org.woehlke.simpleworklist.domain.task.TaskTime;
+import org.woehlke.simpleworklist.domain.context.ContextRepository;
+import org.woehlke.simpleworklist.domain.task.TaskRepository;
+import org.woehlke.simpleworklist.domain.project.ProjectRepository;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
import java.util.UUID;
@Slf4j
diff --git a/src/main/java/org/woehlke/simpleworklist/application/breadcrumb/Breadcrumb.java b/src/main/java/org/woehlke/simpleworklist/domain/breadcrumb/Breadcrumb.java
similarity index 93%
rename from src/main/java/org/woehlke/simpleworklist/application/breadcrumb/Breadcrumb.java
rename to src/main/java/org/woehlke/simpleworklist/domain/breadcrumb/Breadcrumb.java
index d8b02848..0f03a48d 100644
--- a/src/main/java/org/woehlke/simpleworklist/application/breadcrumb/Breadcrumb.java
+++ b/src/main/java/org/woehlke/simpleworklist/domain/breadcrumb/Breadcrumb.java
@@ -1,10 +1,10 @@
-package org.woehlke.simpleworklist.application.breadcrumb;
+package org.woehlke.simpleworklist.domain.breadcrumb;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.ToString;
-import org.woehlke.simpleworklist.project.Project;
-import org.woehlke.simpleworklist.task.Task;
+import org.woehlke.simpleworklist.domain.project.Project;
+import org.woehlke.simpleworklist.domain.task.Task;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/src/main/java/org/woehlke/simpleworklist/application/breadcrumb/BreadcrumbItem.java b/src/main/java/org/woehlke/simpleworklist/domain/breadcrumb/BreadcrumbItem.java
similarity index 89%
rename from src/main/java/org/woehlke/simpleworklist/application/breadcrumb/BreadcrumbItem.java
rename to src/main/java/org/woehlke/simpleworklist/domain/breadcrumb/BreadcrumbItem.java
index e3b682ee..2f9eb870 100644
--- a/src/main/java/org/woehlke/simpleworklist/application/breadcrumb/BreadcrumbItem.java
+++ b/src/main/java/org/woehlke/simpleworklist/domain/breadcrumb/BreadcrumbItem.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.breadcrumb;
+package org.woehlke.simpleworklist.domain.breadcrumb;
import lombok.*;
diff --git a/src/main/java/org/woehlke/simpleworklist/context/Context.java b/src/main/java/org/woehlke/simpleworklist/domain/context/Context.java
similarity index 98%
rename from src/main/java/org/woehlke/simpleworklist/context/Context.java
rename to src/main/java/org/woehlke/simpleworklist/domain/context/Context.java
index fe03ad16..142cede3 100644
--- a/src/main/java/org/woehlke/simpleworklist/context/Context.java
+++ b/src/main/java/org/woehlke/simpleworklist/domain/context/Context.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.context;
+package org.woehlke.simpleworklist.domain.context;
import lombok.*;
import org.hibernate.annotations.LazyToOne;
diff --git a/src/main/java/org/woehlke/simpleworklist/context/ContextController.java b/src/main/java/org/woehlke/simpleworklist/domain/context/ContextController.java
similarity index 93%
rename from src/main/java/org/woehlke/simpleworklist/context/ContextController.java
rename to src/main/java/org/woehlke/simpleworklist/domain/context/ContextController.java
index 4a89adb3..dcbcbe15 100644
--- a/src/main/java/org/woehlke/simpleworklist/context/ContextController.java
+++ b/src/main/java/org/woehlke/simpleworklist/domain/context/ContextController.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.context;
+package org.woehlke.simpleworklist.domain.context;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
@@ -8,6 +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.services.ContextService;
import org.woehlke.simpleworklist.user.session.UserSessionBean;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/woehlke/simpleworklist/context/ContextRepository.java b/src/main/java/org/woehlke/simpleworklist/domain/context/ContextRepository.java
similarity index 93%
rename from src/main/java/org/woehlke/simpleworklist/context/ContextRepository.java
rename to src/main/java/org/woehlke/simpleworklist/domain/context/ContextRepository.java
index f06cd736..eeed598d 100644
--- a/src/main/java/org/woehlke/simpleworklist/context/ContextRepository.java
+++ b/src/main/java/org/woehlke/simpleworklist/domain/context/ContextRepository.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.context;
+package org.woehlke.simpleworklist.domain.context;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
diff --git a/src/main/java/org/woehlke/simpleworklist/context/NewContextForm.java b/src/main/java/org/woehlke/simpleworklist/domain/context/NewContextForm.java
similarity index 93%
rename from src/main/java/org/woehlke/simpleworklist/context/NewContextForm.java
rename to src/main/java/org/woehlke/simpleworklist/domain/context/NewContextForm.java
index 66966512..8be1273a 100644
--- a/src/main/java/org/woehlke/simpleworklist/context/NewContextForm.java
+++ b/src/main/java/org/woehlke/simpleworklist/domain/context/NewContextForm.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.context;
+package org.woehlke.simpleworklist.domain.context;
import lombok.*;
import org.hibernate.validator.constraints.Length;
diff --git a/src/main/java/org/woehlke/simpleworklist/project/Project.java b/src/main/java/org/woehlke/simpleworklist/domain/project/Project.java
similarity index 91%
rename from src/main/java/org/woehlke/simpleworklist/project/Project.java
rename to src/main/java/org/woehlke/simpleworklist/domain/project/Project.java
index 05204169..751a2475 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/Project.java
+++ b/src/main/java/org/woehlke/simpleworklist/domain/project/Project.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.project;
+package org.woehlke.simpleworklist.domain.project;
import java.io.Serializable;
import java.util.ArrayList;
@@ -16,7 +16,7 @@
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
//import org.hibernate.validator.constraints.SafeHtml;
-import org.woehlke.simpleworklist.context.Context;
+import org.woehlke.simpleworklist.domain.context.Context;
import org.woehlke.simpleworklist.application.common.AuditModel;
import org.woehlke.simpleworklist.application.common.ComparableById;
import org.woehlke.simpleworklist.user.account.UserAccount;
@@ -155,17 +155,10 @@ public static Project newRootProjectFactory(Context context) {
return thisProject;
}
-
- //TODO: use newRootProjectFactory(Context context);
- @Deprecated
- public static Project newRootProjectFactory(UserAccount userAccount, Context context) {
- return newRootProjectFactory(context);
- }
-
- public Project addOtherProjectToChildren(Project project) {
- children.add(project);
- project.setParent(this);
- return project;
+ public Project addOtherProjectToChildren(Project otherProject) {
+ children.add(otherProject);
+ otherProject.setParent(this);
+ return otherProject;
}
public String out(){
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java b/src/main/java/org/woehlke/simpleworklist/domain/project/ProjectIdController.java
similarity index 97%
rename from src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
rename to src/main/java/org/woehlke/simpleworklist/domain/project/ProjectIdController.java
index 8f391259..2d5c0f74 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
+++ b/src/main/java/org/woehlke/simpleworklist/domain/project/ProjectIdController.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.project;
+package org.woehlke.simpleworklist.domain.project;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page;
@@ -12,10 +12,16 @@
import org.springframework.validation.ObjectError;
import org.springframework.web.bind.annotation.*;
import org.woehlke.simpleworklist.application.common.AbstractController;
-import org.woehlke.simpleworklist.context.Context;
-import org.woehlke.simpleworklist.task.*;
+import org.woehlke.simpleworklist.domain.context.Context;
+import org.woehlke.simpleworklist.services.ProjectControllerService;
+import org.woehlke.simpleworklist.domain.task.Task;
+import org.woehlke.simpleworklist.domain.task.TaskEnergy;
+import org.woehlke.simpleworklist.domain.task.TaskState;
+import org.woehlke.simpleworklist.domain.task.TaskTime;
+import org.woehlke.simpleworklist.services.TaskProjektService;
+import org.woehlke.simpleworklist.services.TaskService;
import org.woehlke.simpleworklist.user.account.UserAccount;
-import org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb;
+import org.woehlke.simpleworklist.domain.breadcrumb.Breadcrumb;
import org.woehlke.simpleworklist.user.session.UserSessionBean;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +29,7 @@
import java.util.List;
import java.util.Locale;
-import static org.woehlke.simpleworklist.project.Project.rootProjectId;
+import static org.woehlke.simpleworklist.domain.project.Project.rootProjectId;
/**
* Created by tw on 14.02.16.
@@ -31,14 +37,14 @@
@Slf4j
@Controller
@RequestMapping(path = "/project/{projectId}")
-public class ProjectController extends AbstractController {
+public class ProjectIdController extends AbstractController {
private final ProjectControllerService projectControllerService;
private final TaskService taskService;
private final TaskProjektService taskProjektService;
@Autowired
- public ProjectController(
+ public ProjectIdController(
ProjectControllerService projectControllerService,
TaskService taskService,
TaskProjektService taskProjektService
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectRepository.java b/src/main/java/org/woehlke/simpleworklist/domain/project/ProjectRepository.java
similarity index 87%
rename from src/main/java/org/woehlke/simpleworklist/project/ProjectRepository.java
rename to src/main/java/org/woehlke/simpleworklist/domain/project/ProjectRepository.java
index 89477763..fb0952ac 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectRepository.java
+++ b/src/main/java/org/woehlke/simpleworklist/domain/project/ProjectRepository.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.project;
+package org.woehlke.simpleworklist.domain.project;
import java.util.List;
@@ -6,7 +6,7 @@
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
-import org.woehlke.simpleworklist.context.Context;
+import org.woehlke.simpleworklist.domain.context.Context;
@Repository
public interface ProjectRepository extends JpaRepository {
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java b/src/main/java/org/woehlke/simpleworklist/domain/project/ProjectRootController.java
similarity index 96%
rename from src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java
rename to src/main/java/org/woehlke/simpleworklist/domain/project/ProjectRootController.java
index f9e10529..2abdd8fa 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java
+++ b/src/main/java/org/woehlke/simpleworklist/domain/project/ProjectRootController.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.project;
+package org.woehlke.simpleworklist.domain.project;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -12,10 +12,16 @@
import org.springframework.validation.FieldError;
import org.springframework.validation.ObjectError;
import org.springframework.web.bind.annotation.*;
-import org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb;
+import org.woehlke.simpleworklist.domain.breadcrumb.Breadcrumb;
import org.woehlke.simpleworklist.application.common.AbstractController;
-import org.woehlke.simpleworklist.context.Context;
-import org.woehlke.simpleworklist.task.*;
+import org.woehlke.simpleworklist.domain.context.Context;
+import org.woehlke.simpleworklist.services.ProjectControllerService;
+import org.woehlke.simpleworklist.domain.task.Task;
+import org.woehlke.simpleworklist.domain.task.TaskEnergy;
+import org.woehlke.simpleworklist.domain.task.TaskState;
+import org.woehlke.simpleworklist.domain.task.TaskTime;
+import org.woehlke.simpleworklist.services.TaskProjektService;
+import org.woehlke.simpleworklist.services.TaskService;
import org.woehlke.simpleworklist.user.session.UserSessionBean;
import org.woehlke.simpleworklist.user.account.UserAccount;
@@ -24,12 +30,12 @@
import java.util.Locale;
import java.util.UUID;
-import static org.woehlke.simpleworklist.project.Project.rootProjectId;
+import static org.woehlke.simpleworklist.domain.project.Project.rootProjectId;
@Slf4j
@Controller
@RequestMapping(path = "/project/root")
-public class ProjectControllerRoot extends AbstractController {
+public class ProjectRootController extends AbstractController {
public final static String rootProjectUrl = "redirect:/project/root";
@@ -38,7 +44,7 @@ public class ProjectControllerRoot extends AbstractController {
private final TaskProjektService taskProjektService;
@Autowired
- public ProjectControllerRoot(ProjectControllerService projectControllerService, TaskService taskService, TaskProjektService taskProjektService) {
+ public ProjectRootController(ProjectControllerService projectControllerService, TaskService taskService, TaskProjektService taskProjektService) {
this.projectControllerService = projectControllerService;
this.taskService = taskService;
this.taskProjektService = taskProjektService;
diff --git a/src/main/java/org/woehlke/simpleworklist/search/SearchController.java b/src/main/java/org/woehlke/simpleworklist/domain/search/SearchController.java
similarity index 86%
rename from src/main/java/org/woehlke/simpleworklist/search/SearchController.java
rename to src/main/java/org/woehlke/simpleworklist/domain/search/SearchController.java
index 1b82d821..82055eff 100644
--- a/src/main/java/org/woehlke/simpleworklist/search/SearchController.java
+++ b/src/main/java/org/woehlke/simpleworklist/domain/search/SearchController.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.search;
+package org.woehlke.simpleworklist.domain.search;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
@@ -8,9 +8,10 @@
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.application.breadcrumb.Breadcrumb;
+import org.woehlke.simpleworklist.domain.breadcrumb.Breadcrumb;
+import org.woehlke.simpleworklist.services.SearchService;
import org.woehlke.simpleworklist.user.session.UserSessionBean;
-import org.woehlke.simpleworklist.context.Context;
+import org.woehlke.simpleworklist.domain.context.Context;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,7 +33,7 @@ public SearchController(SearchService searchService) {
}
@RequestMapping(path = "", method = RequestMethod.GET)
- public final String searchResults(
+ public final String searchGet(
@RequestParam String searchterm,
@ModelAttribute("userSession") UserSessionBean userSession,
Locale locale, Model model
diff --git a/src/main/java/org/woehlke/simpleworklist/search/SearchRequest.java b/src/main/java/org/woehlke/simpleworklist/domain/search/SearchRequest.java
similarity index 95%
rename from src/main/java/org/woehlke/simpleworklist/search/SearchRequest.java
rename to src/main/java/org/woehlke/simpleworklist/domain/search/SearchRequest.java
index a25d60cc..c536069a 100644
--- a/src/main/java/org/woehlke/simpleworklist/search/SearchRequest.java
+++ b/src/main/java/org/woehlke/simpleworklist/domain/search/SearchRequest.java
@@ -1,11 +1,11 @@
-package org.woehlke.simpleworklist.search;
+package org.woehlke.simpleworklist.domain.search;
import lombok.*;
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
import org.woehlke.simpleworklist.application.common.AuditModel;
import org.woehlke.simpleworklist.application.common.ComparableById;
-import org.woehlke.simpleworklist.context.Context;
+import org.woehlke.simpleworklist.domain.context.Context;
import javax.persistence.*;
import javax.validation.constraints.NotNull;
diff --git a/src/main/java/org/woehlke/simpleworklist/search/SearchRequestRepository.java b/src/main/java/org/woehlke/simpleworklist/domain/search/SearchRequestRepository.java
similarity index 81%
rename from src/main/java/org/woehlke/simpleworklist/search/SearchRequestRepository.java
rename to src/main/java/org/woehlke/simpleworklist/domain/search/SearchRequestRepository.java
index 4c95c974..c9a65ddb 100644
--- a/src/main/java/org/woehlke/simpleworklist/search/SearchRequestRepository.java
+++ b/src/main/java/org/woehlke/simpleworklist/domain/search/SearchRequestRepository.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.search;
+package org.woehlke.simpleworklist.domain.search;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/org/woehlke/simpleworklist/search/SearchResult.java b/src/main/java/org/woehlke/simpleworklist/domain/search/SearchResult.java
similarity index 94%
rename from src/main/java/org/woehlke/simpleworklist/search/SearchResult.java
rename to src/main/java/org/woehlke/simpleworklist/domain/search/SearchResult.java
index 873b4a70..7cb1f679 100644
--- a/src/main/java/org/woehlke/simpleworklist/search/SearchResult.java
+++ b/src/main/java/org/woehlke/simpleworklist/domain/search/SearchResult.java
@@ -1,12 +1,12 @@
-package org.woehlke.simpleworklist.search;
+package org.woehlke.simpleworklist.domain.search;
import lombok.*;
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
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;
+import org.woehlke.simpleworklist.domain.task.Task;
+import org.woehlke.simpleworklist.domain.project.Project;
import javax.persistence.*;
import java.io.Serializable;
diff --git a/src/main/java/org/woehlke/simpleworklist/search/SearchResultRepository.java b/src/main/java/org/woehlke/simpleworklist/domain/search/SearchResultRepository.java
similarity index 80%
rename from src/main/java/org/woehlke/simpleworklist/search/SearchResultRepository.java
rename to src/main/java/org/woehlke/simpleworklist/domain/search/SearchResultRepository.java
index 4b912b8e..9f9fe381 100644
--- a/src/main/java/org/woehlke/simpleworklist/search/SearchResultRepository.java
+++ b/src/main/java/org/woehlke/simpleworklist/domain/search/SearchResultRepository.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.search;
+package org.woehlke.simpleworklist.domain.search;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/org/woehlke/simpleworklist/task/Task.java b/src/main/java/org/woehlke/simpleworklist/domain/task/Task.java
similarity index 98%
rename from src/main/java/org/woehlke/simpleworklist/task/Task.java
rename to src/main/java/org/woehlke/simpleworklist/domain/task/Task.java
index 09b1bde3..d4b9e5cd 100644
--- a/src/main/java/org/woehlke/simpleworklist/task/Task.java
+++ b/src/main/java/org/woehlke/simpleworklist/domain/task/Task.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.task;
+package org.woehlke.simpleworklist.domain.task;
import java.io.Serializable;
import java.util.Date;
@@ -21,8 +21,8 @@
//import org.hibernate.validator.constraints.SafeHtml;
import org.springframework.format.annotation.DateTimeFormat;
-import org.woehlke.simpleworklist.context.Context;
-import org.woehlke.simpleworklist.project.Project;
+import org.woehlke.simpleworklist.domain.context.Context;
+import org.woehlke.simpleworklist.domain.project.Project;
import org.woehlke.simpleworklist.user.account.UserAccount;
import org.woehlke.simpleworklist.application.common.AuditModel;
import org.woehlke.simpleworklist.application.common.ComparableById;
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskEnergy.java b/src/main/java/org/woehlke/simpleworklist/domain/task/TaskEnergy.java
similarity index 93%
rename from src/main/java/org/woehlke/simpleworklist/task/TaskEnergy.java
rename to src/main/java/org/woehlke/simpleworklist/domain/task/TaskEnergy.java
index 0c68adaf..3b02a729 100644
--- a/src/main/java/org/woehlke/simpleworklist/task/TaskEnergy.java
+++ b/src/main/java/org/woehlke/simpleworklist/domain/task/TaskEnergy.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.task;
+package org.woehlke.simpleworklist.domain.task;
import javax.persistence.Enumerated;
import java.io.Serializable;
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskRepository.java b/src/main/java/org/woehlke/simpleworklist/domain/task/TaskRepository.java
similarity index 97%
rename from src/main/java/org/woehlke/simpleworklist/task/TaskRepository.java
rename to src/main/java/org/woehlke/simpleworklist/domain/task/TaskRepository.java
index 4add7f4f..3c01ce6d 100644
--- a/src/main/java/org/woehlke/simpleworklist/task/TaskRepository.java
+++ b/src/main/java/org/woehlke/simpleworklist/domain/task/TaskRepository.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.task;
+package org.woehlke.simpleworklist.domain.task;
import java.util.List;
@@ -8,8 +8,8 @@
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
-import org.woehlke.simpleworklist.context.Context;
-import org.woehlke.simpleworklist.project.Project;
+import org.woehlke.simpleworklist.domain.context.Context;
+import org.woehlke.simpleworklist.domain.project.Project;
@Repository
public interface TaskRepository extends JpaRepository {
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskState.java b/src/main/java/org/woehlke/simpleworklist/domain/task/TaskState.java
similarity index 96%
rename from src/main/java/org/woehlke/simpleworklist/task/TaskState.java
rename to src/main/java/org/woehlke/simpleworklist/domain/task/TaskState.java
index f71b2ca7..6a1aae0f 100644
--- a/src/main/java/org/woehlke/simpleworklist/task/TaskState.java
+++ b/src/main/java/org/woehlke/simpleworklist/domain/task/TaskState.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.task;
+package org.woehlke.simpleworklist.domain.task;
import java.io.Serializable;
import java.util.Arrays;
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskStateTabController.java b/src/main/java/org/woehlke/simpleworklist/domain/task/TaskStateTabController.java
similarity index 97%
rename from src/main/java/org/woehlke/simpleworklist/task/TaskStateTabController.java
rename to src/main/java/org/woehlke/simpleworklist/domain/task/TaskStateTabController.java
index ba2130f9..01863b0e 100644
--- a/src/main/java/org/woehlke/simpleworklist/task/TaskStateTabController.java
+++ b/src/main/java/org/woehlke/simpleworklist/domain/task/TaskStateTabController.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.task;
+package org.woehlke.simpleworklist.domain.task;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -11,7 +11,8 @@
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.context.Context;
+import org.woehlke.simpleworklist.domain.context.Context;
+import org.woehlke.simpleworklist.services.TaskStateControllerService;
import org.woehlke.simpleworklist.user.session.UserSessionBean;
import javax.validation.constraints.NotNull;
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java b/src/main/java/org/woehlke/simpleworklist/domain/task/TaskStateTaskController.java
similarity index 97%
rename from src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java
rename to src/main/java/org/woehlke/simpleworklist/domain/task/TaskStateTaskController.java
index bf95ce6e..30966be6 100644
--- a/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java
+++ b/src/main/java/org/woehlke/simpleworklist/domain/task/TaskStateTaskController.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.task;
+package org.woehlke.simpleworklist.domain.task;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
@@ -7,10 +7,13 @@
import org.springframework.validation.FieldError;
import org.springframework.validation.ObjectError;
import org.springframework.web.bind.annotation.*;
-import org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb;
+import org.woehlke.simpleworklist.domain.breadcrumb.Breadcrumb;
import org.woehlke.simpleworklist.application.common.AbstractController;
-import org.woehlke.simpleworklist.context.Context;
-import org.woehlke.simpleworklist.project.Project;
+import org.woehlke.simpleworklist.domain.context.Context;
+import org.woehlke.simpleworklist.domain.project.Project;
+import org.woehlke.simpleworklist.services.TaskProjektService;
+import org.woehlke.simpleworklist.services.TaskService;
+import org.woehlke.simpleworklist.services.TaskStateControllerService;
import org.woehlke.simpleworklist.user.session.UserSessionBean;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskTime.java b/src/main/java/org/woehlke/simpleworklist/domain/task/TaskTime.java
similarity index 95%
rename from src/main/java/org/woehlke/simpleworklist/task/TaskTime.java
rename to src/main/java/org/woehlke/simpleworklist/domain/task/TaskTime.java
index c96fafcf..cc92ab5a 100644
--- a/src/main/java/org/woehlke/simpleworklist/task/TaskTime.java
+++ b/src/main/java/org/woehlke/simpleworklist/domain/task/TaskTime.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.task;
+package org.woehlke.simpleworklist.domain.task;
import javax.persistence.Enumerated;
import java.io.Serializable;
diff --git a/src/main/java/org/woehlke/simpleworklist/search/SearchService.java b/src/main/java/org/woehlke/simpleworklist/search/SearchService.java
deleted file mode 100644
index 202a1b41..00000000
--- a/src/main/java/org/woehlke/simpleworklist/search/SearchService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.woehlke.simpleworklist.search;
-
-import org.woehlke.simpleworklist.context.Context;
-import org.woehlke.simpleworklist.user.account.UserAccount;
-
-/**
- * Created by tw on 14.02.16.
- */
-public interface SearchService {
-
- SearchResult search(SearchRequest searchRequest);
-
- SearchResult search(String searchterm, Context context);
-
- void resetSearchIndex();
-
-}
diff --git a/src/main/java/org/woehlke/simpleworklist/context/ContextService.java b/src/main/java/org/woehlke/simpleworklist/services/ContextService.java
similarity index 79%
rename from src/main/java/org/woehlke/simpleworklist/context/ContextService.java
rename to src/main/java/org/woehlke/simpleworklist/services/ContextService.java
index 4d207d7b..8ecae93a 100644
--- a/src/main/java/org/woehlke/simpleworklist/context/ContextService.java
+++ b/src/main/java/org/woehlke/simpleworklist/services/ContextService.java
@@ -1,5 +1,7 @@
-package org.woehlke.simpleworklist.context;
+package org.woehlke.simpleworklist.services;
+import org.woehlke.simpleworklist.domain.context.Context;
+import org.woehlke.simpleworklist.domain.context.NewContextForm;
import org.woehlke.simpleworklist.user.account.UserAccount;
import java.util.List;
diff --git a/src/main/java/org/woehlke/simpleworklist/context/ContextServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/services/ContextServiceImpl.java
similarity index 88%
rename from src/main/java/org/woehlke/simpleworklist/context/ContextServiceImpl.java
rename to src/main/java/org/woehlke/simpleworklist/services/ContextServiceImpl.java
index 10fb79cf..7ff58fde 100644
--- a/src/main/java/org/woehlke/simpleworklist/context/ContextServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/services/ContextServiceImpl.java
@@ -1,12 +1,15 @@
-package org.woehlke.simpleworklist.context;
+package org.woehlke.simpleworklist.services;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
+import org.woehlke.simpleworklist.domain.context.Context;
+import org.woehlke.simpleworklist.domain.context.ContextRepository;
+import org.woehlke.simpleworklist.domain.context.NewContextForm;
import org.woehlke.simpleworklist.user.account.UserAccount;
-import org.woehlke.simpleworklist.project.ProjectRepository;
-import org.woehlke.simpleworklist.task.TaskRepository;
+import org.woehlke.simpleworklist.domain.project.ProjectRepository;
+import org.woehlke.simpleworklist.domain.task.TaskRepository;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerService.java b/src/main/java/org/woehlke/simpleworklist/services/ProjectControllerService.java
similarity index 86%
rename from src/main/java/org/woehlke/simpleworklist/project/ProjectControllerService.java
rename to src/main/java/org/woehlke/simpleworklist/services/ProjectControllerService.java
index 943b081f..ae9771df 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerService.java
+++ b/src/main/java/org/woehlke/simpleworklist/services/ProjectControllerService.java
@@ -1,9 +1,10 @@
-package org.woehlke.simpleworklist.project;
+package org.woehlke.simpleworklist.services;
import org.springframework.ui.Model;
import org.springframework.validation.BindingResult;
-import org.woehlke.simpleworklist.context.Context;
-import org.woehlke.simpleworklist.task.Task;
+import org.woehlke.simpleworklist.domain.context.Context;
+import org.woehlke.simpleworklist.domain.project.Project;
+import org.woehlke.simpleworklist.domain.task.Task;
import org.woehlke.simpleworklist.user.session.UserSessionBean;
import org.woehlke.simpleworklist.user.account.UserAccount;
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/services/ProjectControllerServiceImpl.java
similarity index 95%
rename from src/main/java/org/woehlke/simpleworklist/project/ProjectControllerServiceImpl.java
rename to src/main/java/org/woehlke/simpleworklist/services/ProjectControllerServiceImpl.java
index cfcacefa..7a2574f0 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/services/ProjectControllerServiceImpl.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.project;
+package org.woehlke.simpleworklist.services;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -7,11 +7,11 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.Model;
import org.springframework.validation.BindingResult;
-import org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb;
-import org.woehlke.simpleworklist.application.breadcrumb.BreadcrumbService;
-import org.woehlke.simpleworklist.context.Context;
-import org.woehlke.simpleworklist.task.Task;
-import org.woehlke.simpleworklist.task.TaskService;
+import org.woehlke.simpleworklist.domain.breadcrumb.Breadcrumb;
+import org.woehlke.simpleworklist.application.breadcrumb.services.BreadcrumbService;
+import org.woehlke.simpleworklist.domain.context.Context;
+import org.woehlke.simpleworklist.domain.project.Project;
+import org.woehlke.simpleworklist.domain.task.Task;
import org.woehlke.simpleworklist.user.session.UserSessionBean;
import org.woehlke.simpleworklist.user.account.UserAccount;
@@ -19,7 +19,7 @@
import javax.validation.constraints.NotNull;
import java.util.Locale;
-import static org.woehlke.simpleworklist.project.Project.rootProjectId;
+import static org.woehlke.simpleworklist.domain.project.Project.rootProjectId;
@Slf4j
@Service
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectService.java b/src/main/java/org/woehlke/simpleworklist/services/ProjectService.java
similarity index 85%
rename from src/main/java/org/woehlke/simpleworklist/project/ProjectService.java
rename to src/main/java/org/woehlke/simpleworklist/services/ProjectService.java
index a9f8db6e..c43cfd97 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectService.java
+++ b/src/main/java/org/woehlke/simpleworklist/services/ProjectService.java
@@ -1,10 +1,11 @@
-package org.woehlke.simpleworklist.project;
+package org.woehlke.simpleworklist.services;
import java.util.List;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import org.woehlke.simpleworklist.context.Context;
+import org.woehlke.simpleworklist.domain.context.Context;
+import org.woehlke.simpleworklist.domain.project.Project;
public interface ProjectService {
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/services/ProjectServiceImpl.java
similarity index 94%
rename from src/main/java/org/woehlke/simpleworklist/project/ProjectServiceImpl.java
rename to src/main/java/org/woehlke/simpleworklist/services/ProjectServiceImpl.java
index dc57bcad..722a0528 100644
--- a/src/main/java/org/woehlke/simpleworklist/project/ProjectServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/services/ProjectServiceImpl.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.project;
+package org.woehlke.simpleworklist.services;
import java.util.ArrayList;
import java.util.List;
@@ -12,9 +12,11 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
-import org.woehlke.simpleworklist.context.Context;
-import org.woehlke.simpleworklist.task.Task;
-import org.woehlke.simpleworklist.task.TaskRepository;
+import org.woehlke.simpleworklist.domain.context.Context;
+import org.woehlke.simpleworklist.domain.project.Project;
+import org.woehlke.simpleworklist.domain.project.ProjectRepository;
+import org.woehlke.simpleworklist.domain.task.Task;
+import org.woehlke.simpleworklist.domain.task.TaskRepository;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
diff --git a/src/main/java/org/woehlke/simpleworklist/search/SearchRequestService.java b/src/main/java/org/woehlke/simpleworklist/services/SearchRequestService.java
similarity index 58%
rename from src/main/java/org/woehlke/simpleworklist/search/SearchRequestService.java
rename to src/main/java/org/woehlke/simpleworklist/services/SearchRequestService.java
index cbdbe5e9..0984adbd 100644
--- a/src/main/java/org/woehlke/simpleworklist/search/SearchRequestService.java
+++ b/src/main/java/org/woehlke/simpleworklist/services/SearchRequestService.java
@@ -1,4 +1,6 @@
-package org.woehlke.simpleworklist.search;
+package org.woehlke.simpleworklist.services;
+
+import org.woehlke.simpleworklist.domain.search.SearchRequest;
public interface SearchRequestService {
diff --git a/src/main/java/org/woehlke/simpleworklist/search/SearchRequestServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/services/SearchRequestServiceImpl.java
similarity index 86%
rename from src/main/java/org/woehlke/simpleworklist/search/SearchRequestServiceImpl.java
rename to src/main/java/org/woehlke/simpleworklist/services/SearchRequestServiceImpl.java
index ecf9f41a..4311a404 100644
--- a/src/main/java/org/woehlke/simpleworklist/search/SearchRequestServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/services/SearchRequestServiceImpl.java
@@ -1,10 +1,12 @@
-package org.woehlke.simpleworklist.search;
+package org.woehlke.simpleworklist.services;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
+import org.woehlke.simpleworklist.domain.search.SearchRequest;
+import org.woehlke.simpleworklist.domain.search.SearchRequestRepository;
import java.util.UUID;
diff --git a/src/main/java/org/woehlke/simpleworklist/search/SearchResultService.java b/src/main/java/org/woehlke/simpleworklist/services/SearchResultService.java
similarity index 61%
rename from src/main/java/org/woehlke/simpleworklist/search/SearchResultService.java
rename to src/main/java/org/woehlke/simpleworklist/services/SearchResultService.java
index 90118756..e3697767 100644
--- a/src/main/java/org/woehlke/simpleworklist/search/SearchResultService.java
+++ b/src/main/java/org/woehlke/simpleworklist/services/SearchResultService.java
@@ -1,4 +1,6 @@
-package org.woehlke.simpleworklist.search;
+package org.woehlke.simpleworklist.services;
+
+import org.woehlke.simpleworklist.domain.search.SearchResult;
public interface SearchResultService {
diff --git a/src/main/java/org/woehlke/simpleworklist/search/SearchResultServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/services/SearchResultServiceImpl.java
similarity index 87%
rename from src/main/java/org/woehlke/simpleworklist/search/SearchResultServiceImpl.java
rename to src/main/java/org/woehlke/simpleworklist/services/SearchResultServiceImpl.java
index 733cdab9..a7f717d9 100644
--- a/src/main/java/org/woehlke/simpleworklist/search/SearchResultServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/services/SearchResultServiceImpl.java
@@ -1,10 +1,12 @@
-package org.woehlke.simpleworklist.search;
+package org.woehlke.simpleworklist.services;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
+import org.woehlke.simpleworklist.domain.search.SearchResult;
+import org.woehlke.simpleworklist.domain.search.SearchResultRepository;
import java.util.UUID;
diff --git a/src/main/java/org/woehlke/simpleworklist/services/SearchService.java b/src/main/java/org/woehlke/simpleworklist/services/SearchService.java
new file mode 100644
index 00000000..e2f26a52
--- /dev/null
+++ b/src/main/java/org/woehlke/simpleworklist/services/SearchService.java
@@ -0,0 +1,18 @@
+package org.woehlke.simpleworklist.services;
+
+import org.woehlke.simpleworklist.domain.context.Context;
+import org.woehlke.simpleworklist.domain.search.SearchRequest;
+import org.woehlke.simpleworklist.domain.search.SearchResult;
+
+/**
+ * Created by tw on 14.02.16.
+ */
+public interface SearchService {
+
+ SearchResult search(SearchRequest searchRequest);
+
+ SearchResult search(String searchterm, Context context);
+
+ void resetSearchIndex();
+
+}
diff --git a/src/main/java/org/woehlke/simpleworklist/search/SearchServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/services/SearchServiceImpl.java
similarity index 88%
rename from src/main/java/org/woehlke/simpleworklist/search/SearchServiceImpl.java
rename to src/main/java/org/woehlke/simpleworklist/services/SearchServiceImpl.java
index 78ef8caf..af07c533 100644
--- a/src/main/java/org/woehlke/simpleworklist/search/SearchServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/services/SearchServiceImpl.java
@@ -1,10 +1,12 @@
-package org.woehlke.simpleworklist.search;
+package org.woehlke.simpleworklist.services;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
-import org.woehlke.simpleworklist.context.Context;
+import org.woehlke.simpleworklist.domain.context.Context;
+import org.woehlke.simpleworklist.domain.search.SearchRequest;
+import org.woehlke.simpleworklist.domain.search.SearchResult;
/**
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskProjektService.java b/src/main/java/org/woehlke/simpleworklist/services/TaskProjektService.java
similarity index 70%
rename from src/main/java/org/woehlke/simpleworklist/task/TaskProjektService.java
rename to src/main/java/org/woehlke/simpleworklist/services/TaskProjektService.java
index 1e076450..1ace231c 100644
--- a/src/main/java/org/woehlke/simpleworklist/task/TaskProjektService.java
+++ b/src/main/java/org/woehlke/simpleworklist/services/TaskProjektService.java
@@ -1,6 +1,7 @@
-package org.woehlke.simpleworklist.task;
+package org.woehlke.simpleworklist.services;
import org.springframework.ui.Model;
+import org.woehlke.simpleworklist.domain.task.Task;
import org.woehlke.simpleworklist.user.session.UserSessionBean;
public interface TaskProjektService {
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskProjektServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/services/TaskProjektServiceImpl.java
similarity index 91%
rename from src/main/java/org/woehlke/simpleworklist/task/TaskProjektServiceImpl.java
rename to src/main/java/org/woehlke/simpleworklist/services/TaskProjektServiceImpl.java
index 0dfaa920..f36441f4 100644
--- a/src/main/java/org/woehlke/simpleworklist/task/TaskProjektServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/services/TaskProjektServiceImpl.java
@@ -1,16 +1,15 @@
-package org.woehlke.simpleworklist.task;
+package org.woehlke.simpleworklist.services;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.ui.Model;
-import org.woehlke.simpleworklist.project.Project;
-import org.woehlke.simpleworklist.project.ProjectService;
+import org.woehlke.simpleworklist.domain.project.Project;
+import org.woehlke.simpleworklist.domain.task.Task;
import org.woehlke.simpleworklist.user.session.UserSessionBean;
import javax.validation.constraints.NotNull;
-import java.util.UUID;
@Slf4j
@Service
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskService.java b/src/main/java/org/woehlke/simpleworklist/services/TaskService.java
similarity index 90%
rename from src/main/java/org/woehlke/simpleworklist/task/TaskService.java
rename to src/main/java/org/woehlke/simpleworklist/services/TaskService.java
index 8b41e5e2..cc7ba2ce 100644
--- a/src/main/java/org/woehlke/simpleworklist/task/TaskService.java
+++ b/src/main/java/org/woehlke/simpleworklist/services/TaskService.java
@@ -1,9 +1,11 @@
-package org.woehlke.simpleworklist.task;
+package org.woehlke.simpleworklist.services;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
-import org.woehlke.simpleworklist.context.Context;
-import org.woehlke.simpleworklist.project.Project;
+import org.woehlke.simpleworklist.domain.context.Context;
+import org.woehlke.simpleworklist.domain.project.Project;
+import org.woehlke.simpleworklist.domain.task.Task;
+import org.woehlke.simpleworklist.domain.task.TaskState;
public interface TaskService {
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/services/TaskServiceImpl.java
similarity index 98%
rename from src/main/java/org/woehlke/simpleworklist/task/TaskServiceImpl.java
rename to src/main/java/org/woehlke/simpleworklist/services/TaskServiceImpl.java
index e8d61ffb..f3cb6e50 100644
--- a/src/main/java/org/woehlke/simpleworklist/task/TaskServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/services/TaskServiceImpl.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.task;
+package org.woehlke.simpleworklist.services;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -7,8 +7,11 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
-import org.woehlke.simpleworklist.context.Context;
-import org.woehlke.simpleworklist.project.Project;
+import org.woehlke.simpleworklist.domain.context.Context;
+import org.woehlke.simpleworklist.domain.project.Project;
+import org.woehlke.simpleworklist.domain.task.Task;
+import org.woehlke.simpleworklist.domain.task.TaskRepository;
+import org.woehlke.simpleworklist.domain.task.TaskState;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskStateControllerService.java b/src/main/java/org/woehlke/simpleworklist/services/TaskStateControllerService.java
similarity index 71%
rename from src/main/java/org/woehlke/simpleworklist/task/TaskStateControllerService.java
rename to src/main/java/org/woehlke/simpleworklist/services/TaskStateControllerService.java
index f7686d9c..1a97e0b8 100644
--- a/src/main/java/org/woehlke/simpleworklist/task/TaskStateControllerService.java
+++ b/src/main/java/org/woehlke/simpleworklist/services/TaskStateControllerService.java
@@ -1,8 +1,10 @@
-package org.woehlke.simpleworklist.task;
+package org.woehlke.simpleworklist.services;
import org.springframework.data.domain.Pageable;
import org.springframework.ui.Model;
-import org.woehlke.simpleworklist.context.Context;
+import org.woehlke.simpleworklist.domain.context.Context;
+import org.woehlke.simpleworklist.domain.task.Task;
+import org.woehlke.simpleworklist.domain.task.TaskState;
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/services/TaskStateControllerServiceImpl.java
similarity index 91%
rename from src/main/java/org/woehlke/simpleworklist/task/TaskStateControllerServiceImpl.java
rename to src/main/java/org/woehlke/simpleworklist/services/TaskStateControllerServiceImpl.java
index 1b2698f6..31914f29 100644
--- a/src/main/java/org/woehlke/simpleworklist/task/TaskStateControllerServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/services/TaskStateControllerServiceImpl.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.task;
+package org.woehlke.simpleworklist.services;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -8,9 +8,11 @@
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.Model;
-import org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb;
-import org.woehlke.simpleworklist.application.breadcrumb.BreadcrumbService;
-import org.woehlke.simpleworklist.context.Context;
+import org.woehlke.simpleworklist.domain.breadcrumb.Breadcrumb;
+import org.woehlke.simpleworklist.application.breadcrumb.services.BreadcrumbService;
+import org.woehlke.simpleworklist.domain.context.Context;
+import org.woehlke.simpleworklist.domain.task.Task;
+import org.woehlke.simpleworklist.domain.task.TaskState;
import org.woehlke.simpleworklist.user.session.UserSessionBean;
import javax.validation.constraints.NotNull;
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 cf060724..dff7c8ae 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccount.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/account/UserAccount.java
@@ -7,7 +7,7 @@
import lombok.Setter;
import lombok.ToString;
//import org.hibernate.validator.constraints.SafeHtml;
-import org.woehlke.simpleworklist.context.Context;
+import org.woehlke.simpleworklist.domain.context.Context;
import org.woehlke.simpleworklist.application.common.AuditModel;
import org.woehlke.simpleworklist.application.common.ComparableById;
import org.woehlke.simpleworklist.application.language.Language;
diff --git a/src/main/java/org/woehlke/simpleworklist/context/UserChangeDefaultContextForm.java b/src/main/java/org/woehlke/simpleworklist/user/account/UserChangeDefaultContextForm.java
similarity index 80%
rename from src/main/java/org/woehlke/simpleworklist/context/UserChangeDefaultContextForm.java
rename to src/main/java/org/woehlke/simpleworklist/user/account/UserChangeDefaultContextForm.java
index b1f9cb35..9aa69521 100644
--- a/src/main/java/org/woehlke/simpleworklist/context/UserChangeDefaultContextForm.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/account/UserChangeDefaultContextForm.java
@@ -1,6 +1,7 @@
-package org.woehlke.simpleworklist.context;
+package org.woehlke.simpleworklist.user.account;
import lombok.*;
+import org.woehlke.simpleworklist.domain.context.Context;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
diff --git a/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserChangeNameForm.java b/src/main/java/org/woehlke/simpleworklist/user/account/UserChangeNameForm.java
similarity index 92%
rename from src/main/java/org/woehlke/simpleworklist/user/selfservice/UserChangeNameForm.java
rename to src/main/java/org/woehlke/simpleworklist/user/account/UserChangeNameForm.java
index 5936cca7..443ba172 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserChangeNameForm.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/account/UserChangeNameForm.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.selfservice;
+package org.woehlke.simpleworklist.user.account;
import javax.validation.constraints.NotBlank;
diff --git a/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserChangePasswordForm.java b/src/main/java/org/woehlke/simpleworklist/user/account/UserChangePasswordForm.java
similarity index 96%
rename from src/main/java/org/woehlke/simpleworklist/user/selfservice/UserChangePasswordForm.java
rename to src/main/java/org/woehlke/simpleworklist/user/account/UserChangePasswordForm.java
index 42ffe301..09fd2177 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserChangePasswordForm.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/account/UserChangePasswordForm.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.selfservice;
+package org.woehlke.simpleworklist.user.account;
import javax.validation.constraints.NotBlank;
diff --git a/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceController.java b/src/main/java/org/woehlke/simpleworklist/user/account/UserSelfserviceController.java
similarity index 97%
rename from src/main/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceController.java
rename to src/main/java/org/woehlke/simpleworklist/user/account/UserSelfserviceController.java
index c442fc3a..b8d7d9be 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceController.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/account/UserSelfserviceController.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.selfservice;
+package org.woehlke.simpleworklist.user.account;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,15 +15,13 @@
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.application.breadcrumb.Breadcrumb;
+import org.woehlke.simpleworklist.domain.breadcrumb.Breadcrumb;
import org.woehlke.simpleworklist.application.common.AbstractController;
-import org.woehlke.simpleworklist.context.NewContextForm;
-import org.woehlke.simpleworklist.context.UserChangeDefaultContextForm;
+import org.woehlke.simpleworklist.domain.context.NewContextForm;
import org.woehlke.simpleworklist.application.language.UserChangeLanguageForm;
-import org.woehlke.simpleworklist.context.Context;
-import org.woehlke.simpleworklist.user.account.UserAccount;
+import org.woehlke.simpleworklist.domain.context.Context;
import org.woehlke.simpleworklist.application.language.Language;
-import org.woehlke.simpleworklist.user.account.UserAccountAccessService;
+import org.woehlke.simpleworklist.user.services.UserAccountAccessService;
import org.woehlke.simpleworklist.user.session.UserSessionBean;
import javax.validation.Valid;
diff --git a/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageController.java b/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageController.java
index 0dc63ec4..d2514249 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageController.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageController.java
@@ -14,9 +14,9 @@
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.application.breadcrumb.Breadcrumb;
+import org.woehlke.simpleworklist.domain.breadcrumb.Breadcrumb;
import org.woehlke.simpleworklist.user.session.UserSessionBean;
-import org.woehlke.simpleworklist.context.Context;
+import org.woehlke.simpleworklist.domain.context.Context;
import org.woehlke.simpleworklist.user.account.UserAccount;
import javax.validation.Valid;
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 ef7b96ae..a1a06b9b 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/login/LoginSuccessHandler.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/login/LoginSuccessHandler.java
@@ -9,6 +9,7 @@
import org.woehlke.simpleworklist.user.account.UserAccount;
import org.springframework.beans.factory.annotation.Autowired;
+import org.woehlke.simpleworklist.user.services.UserAccountLoginSuccessService;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
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 a0e52ca2..79998cfb 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/login/UserLoginController.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/login/UserLoginController.java
@@ -17,7 +17,8 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.support.SessionStatus;
import org.woehlke.simpleworklist.user.account.UserAccount;
-import org.woehlke.simpleworklist.user.account.UserAccountAccessService;
+import org.woehlke.simpleworklist.user.services.UserAccountAccessService;
+import org.woehlke.simpleworklist.user.services.UserAccountLoginSuccessService;
@Slf4j
@Controller
diff --git a/src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationController.java b/src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationController.java
index 3d38f916..1ad43430 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationController.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationController.java
@@ -10,7 +10,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.woehlke.simpleworklist.user.account.UserAccountForm;
-import org.woehlke.simpleworklist.user.account.UserAccountService;
+import org.woehlke.simpleworklist.user.services.UserAccountService;
+import org.woehlke.simpleworklist.user.services.UserRegistrationService;
import javax.validation.Valid;
diff --git a/src/main/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryController.java b/src/main/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryController.java
index 2aab5445..3b248ddb 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryController.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryController.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.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.validation.BindingResult;
@@ -13,9 +11,11 @@
import org.woehlke.simpleworklist.user.account.UserAccountForm;
import org.woehlke.simpleworklist.user.account.UserAccount;
import org.woehlke.simpleworklist.user.register.UserRegistrationForm;
-import org.woehlke.simpleworklist.user.account.UserAccountService;
+import org.woehlke.simpleworklist.user.services.UserAccountService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.woehlke.simpleworklist.user.services.UserPasswordRecoveryService;
+
import javax.validation.Valid;
@Slf4j
diff --git a/src/main/java/org/woehlke/simpleworklist/user/token/TokenGeneratorService.java b/src/main/java/org/woehlke/simpleworklist/user/services/TokenGeneratorService.java
similarity index 57%
rename from src/main/java/org/woehlke/simpleworklist/user/token/TokenGeneratorService.java
rename to src/main/java/org/woehlke/simpleworklist/user/services/TokenGeneratorService.java
index fed5ee6f..55d54c08 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/token/TokenGeneratorService.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/services/TokenGeneratorService.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.token;
+package org.woehlke.simpleworklist.user.services;
public interface TokenGeneratorService {
diff --git a/src/main/java/org/woehlke/simpleworklist/user/token/TokenGeneratorServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/user/services/TokenGeneratorServiceImpl.java
similarity index 79%
rename from src/main/java/org/woehlke/simpleworklist/user/token/TokenGeneratorServiceImpl.java
rename to src/main/java/org/woehlke/simpleworklist/user/services/TokenGeneratorServiceImpl.java
index 6871c862..b94560e4 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/token/TokenGeneratorServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/services/TokenGeneratorServiceImpl.java
@@ -1,7 +1,7 @@
-package org.woehlke.simpleworklist.user.token;
+package org.woehlke.simpleworklist.user.services;
import org.springframework.stereotype.Service;
-import org.woehlke.simpleworklist.user.token.TokenGeneratorService;
+import org.woehlke.simpleworklist.user.services.TokenGeneratorService;
import java.math.BigInteger;
import java.security.SecureRandom;
diff --git a/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageService.java b/src/main/java/org/woehlke/simpleworklist/user/services/User2UserMessageService.java
similarity index 77%
rename from src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageService.java
rename to src/main/java/org/woehlke/simpleworklist/user/services/User2UserMessageService.java
index b14848d6..5ef4bf50 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageService.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/services/User2UserMessageService.java
@@ -1,8 +1,10 @@
-package org.woehlke.simpleworklist.user.chat;
+package org.woehlke.simpleworklist.user.services;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.woehlke.simpleworklist.user.account.UserAccount;
+import org.woehlke.simpleworklist.user.chat.User2UserMessage;
+import org.woehlke.simpleworklist.user.chat.User2UserMessageFormBean;
/**
* Created by tw on 16.02.2016.
diff --git a/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/user/services/User2UserMessageServiceImpl.java
similarity index 89%
rename from src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageServiceImpl.java
rename to src/main/java/org/woehlke/simpleworklist/user/services/User2UserMessageServiceImpl.java
index 22c78aba..3a02926d 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/services/User2UserMessageServiceImpl.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.chat;
+package org.woehlke.simpleworklist.user.services;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page;
@@ -9,6 +9,11 @@
import org.woehlke.simpleworklist.user.account.UserAccount;
import org.springframework.beans.factory.annotation.Autowired;
+import org.woehlke.simpleworklist.user.chat.User2UserMessage;
+import org.woehlke.simpleworklist.user.chat.User2UserMessageFormBean;
+import org.woehlke.simpleworklist.user.chat.User2UserMessageRepository;
+import org.woehlke.simpleworklist.user.services.User2UserMessageService;
+
import java.util.List;
/**
diff --git a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountAccessService.java b/src/main/java/org/woehlke/simpleworklist/user/services/UserAccountAccessService.java
similarity index 75%
rename from src/main/java/org/woehlke/simpleworklist/user/account/UserAccountAccessService.java
rename to src/main/java/org/woehlke/simpleworklist/user/services/UserAccountAccessService.java
index f0353c51..8a46075c 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountAccessService.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/services/UserAccountAccessService.java
@@ -1,6 +1,6 @@
-package org.woehlke.simpleworklist.user.account;
+package org.woehlke.simpleworklist.user.services;
-import org.woehlke.simpleworklist.user.selfservice.UserChangePasswordForm;
+import org.woehlke.simpleworklist.user.account.UserChangePasswordForm;
import org.woehlke.simpleworklist.user.account.UserAccount;
import org.woehlke.simpleworklist.user.login.LoginForm;
diff --git a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountAccessServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/user/services/UserAccountAccessServiceImpl.java
similarity index 92%
rename from src/main/java/org/woehlke/simpleworklist/user/account/UserAccountAccessServiceImpl.java
rename to src/main/java/org/woehlke/simpleworklist/user/services/UserAccountAccessServiceImpl.java
index 1cebc265..8dfe2de8 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountAccessServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/services/UserAccountAccessServiceImpl.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.account;
+package org.woehlke.simpleworklist.user.services;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -10,8 +10,10 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
+import org.woehlke.simpleworklist.user.account.UserAccount;
+import org.woehlke.simpleworklist.user.account.UserAccountRepository;
import org.woehlke.simpleworklist.user.login.LoginForm;
-import org.woehlke.simpleworklist.user.selfservice.UserChangePasswordForm;
+import org.woehlke.simpleworklist.user.account.UserChangePasswordForm;
@Slf4j
@Service
diff --git a/src/main/java/org/woehlke/simpleworklist/user/login/UserAccountLoginSuccessService.java b/src/main/java/org/woehlke/simpleworklist/user/services/UserAccountLoginSuccessService.java
similarity index 87%
rename from src/main/java/org/woehlke/simpleworklist/user/login/UserAccountLoginSuccessService.java
rename to src/main/java/org/woehlke/simpleworklist/user/services/UserAccountLoginSuccessService.java
index 5af7b1dc..5bee85a6 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/login/UserAccountLoginSuccessService.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/services/UserAccountLoginSuccessService.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.login;
+package org.woehlke.simpleworklist.user.services;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.woehlke.simpleworklist.user.account.UserAccount;
diff --git a/src/main/java/org/woehlke/simpleworklist/user/login/UserAccountLoginSuccessServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/user/services/UserAccountLoginSuccessServiceImpl.java
similarity index 94%
rename from src/main/java/org/woehlke/simpleworklist/user/login/UserAccountLoginSuccessServiceImpl.java
rename to src/main/java/org/woehlke/simpleworklist/user/services/UserAccountLoginSuccessServiceImpl.java
index a1cd9619..23c1afd6 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/login/UserAccountLoginSuccessServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/services/UserAccountLoginSuccessServiceImpl.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.login;
+package org.woehlke.simpleworklist.user.services;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -11,6 +11,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.woehlke.simpleworklist.user.account.UserAccount;
import org.woehlke.simpleworklist.user.account.UserAccountRepository;
+import org.woehlke.simpleworklist.user.services.UserAccountLoginSuccessService;
import java.util.Date;
diff --git a/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserAccountSecurityPasswordService.java b/src/main/java/org/woehlke/simpleworklist/user/services/UserAccountSecurityPasswordService.java
similarity index 76%
rename from src/main/java/org/woehlke/simpleworklist/user/selfservice/UserAccountSecurityPasswordService.java
rename to src/main/java/org/woehlke/simpleworklist/user/services/UserAccountSecurityPasswordService.java
index c9db6d32..08ad4414 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserAccountSecurityPasswordService.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/services/UserAccountSecurityPasswordService.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.selfservice;
+package org.woehlke.simpleworklist.user.services;
import org.springframework.security.core.userdetails.UserDetailsPasswordService;
diff --git a/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserAccountSecurityPasswordServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/user/services/UserAccountSecurityPasswordServiceImpl.java
similarity index 94%
rename from src/main/java/org/woehlke/simpleworklist/user/selfservice/UserAccountSecurityPasswordServiceImpl.java
rename to src/main/java/org/woehlke/simpleworklist/user/services/UserAccountSecurityPasswordServiceImpl.java
index 42d712a5..7751c512 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserAccountSecurityPasswordServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/services/UserAccountSecurityPasswordServiceImpl.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.selfservice;
+package org.woehlke.simpleworklist.user.services;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +14,7 @@
import org.woehlke.simpleworklist.user.account.UserAccount;
import org.woehlke.simpleworklist.user.account.UserDetailsBean;
import org.woehlke.simpleworklist.user.account.UserAccountRepository;
+import org.woehlke.simpleworklist.user.services.UserAccountSecurityPasswordService;
@Slf4j
@Service
diff --git a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountSecurityService.java b/src/main/java/org/woehlke/simpleworklist/user/services/UserAccountSecurityService.java
similarity index 75%
rename from src/main/java/org/woehlke/simpleworklist/user/account/UserAccountSecurityService.java
rename to src/main/java/org/woehlke/simpleworklist/user/services/UserAccountSecurityService.java
index fd2259b8..94143d9e 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountSecurityService.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/services/UserAccountSecurityService.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.account;
+package org.woehlke.simpleworklist.user.services;
import org.springframework.security.core.userdetails.UserDetailsService;
diff --git a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountSecurityServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/user/services/UserAccountSecurityServiceImpl.java
similarity index 78%
rename from src/main/java/org/woehlke/simpleworklist/user/account/UserAccountSecurityServiceImpl.java
rename to src/main/java/org/woehlke/simpleworklist/user/services/UserAccountSecurityServiceImpl.java
index 55ec1ebb..e7324b97 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountSecurityServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/services/UserAccountSecurityServiceImpl.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.account;
+package org.woehlke.simpleworklist.user.services;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -7,6 +7,10 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
+import org.woehlke.simpleworklist.user.account.UserAccount;
+import org.woehlke.simpleworklist.user.account.UserAccountRepository;
+import org.woehlke.simpleworklist.user.account.UserDetailsBean;
+import org.woehlke.simpleworklist.user.services.UserAccountSecurityService;
@Slf4j
@Service
diff --git a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountService.java b/src/main/java/org/woehlke/simpleworklist/user/services/UserAccountService.java
similarity index 93%
rename from src/main/java/org/woehlke/simpleworklist/user/account/UserAccountService.java
rename to src/main/java/org/woehlke/simpleworklist/user/services/UserAccountService.java
index 4fbda5a0..9d326e7a 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountService.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/services/UserAccountService.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.account;
+package org.woehlke.simpleworklist.user.services;
import java.util.Map;
diff --git a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/user/services/UserAccountServiceImpl.java
similarity index 93%
rename from src/main/java/org/woehlke/simpleworklist/user/account/UserAccountServiceImpl.java
rename to src/main/java/org/woehlke/simpleworklist/user/services/UserAccountServiceImpl.java
index 3b775d4b..8eea0fce 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/services/UserAccountServiceImpl.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.account;
+package org.woehlke.simpleworklist.user.services;
import java.util.*;
@@ -13,10 +13,13 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
-import org.woehlke.simpleworklist.context.Context;
+import org.woehlke.simpleworklist.domain.context.Context;
+import org.woehlke.simpleworklist.user.account.UserAccount;
+import org.woehlke.simpleworklist.user.account.UserAccountForm;
+import org.woehlke.simpleworklist.user.account.UserAccountRepository;
import org.woehlke.simpleworklist.user.chat.User2UserMessage;
import org.woehlke.simpleworklist.application.language.Language;
-import org.woehlke.simpleworklist.context.ContextRepository;
+import org.woehlke.simpleworklist.domain.context.ContextRepository;
import org.woehlke.simpleworklist.user.chat.User2UserMessageRepository;
@Slf4j
diff --git a/src/main/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryService.java b/src/main/java/org/woehlke/simpleworklist/user/services/UserPasswordRecoveryService.java
similarity index 79%
rename from src/main/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryService.java
rename to src/main/java/org/woehlke/simpleworklist/user/services/UserPasswordRecoveryService.java
index b925466e..d5921169 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryService.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/services/UserPasswordRecoveryService.java
@@ -1,4 +1,6 @@
-package org.woehlke.simpleworklist.user.resetpassword;
+package org.woehlke.simpleworklist.user.services;
+
+import org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecovery;
public interface UserPasswordRecoveryService {
diff --git a/src/main/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/user/services/UserPasswordRecoveryServiceImpl.java
similarity index 94%
rename from src/main/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryServiceImpl.java
rename to src/main/java/org/woehlke/simpleworklist/user/services/UserPasswordRecoveryServiceImpl.java
index a8a38964..cefc8163 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/services/UserPasswordRecoveryServiceImpl.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.resetpassword;
+package org.woehlke.simpleworklist.user.services;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -10,7 +10,9 @@
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.woehlke.simpleworklist.application.ApplicationProperties;
-import org.woehlke.simpleworklist.user.token.TokenGeneratorService;
+import org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecovery;
+import org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecoveryRepository;
+import org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecoveryStatus;
import java.util.Date;
diff --git a/src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationService.java b/src/main/java/org/woehlke/simpleworklist/user/services/UserRegistrationService.java
similarity index 79%
rename from src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationService.java
rename to src/main/java/org/woehlke/simpleworklist/user/services/UserRegistrationService.java
index 720d64fa..264e8539 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationService.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/services/UserRegistrationService.java
@@ -1,4 +1,6 @@
-package org.woehlke.simpleworklist.user.register;
+package org.woehlke.simpleworklist.user.services;
+
+import org.woehlke.simpleworklist.user.register.UserRegistration;
public interface UserRegistrationService {
diff --git a/src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/user/services/UserRegistrationServiceImpl.java
similarity index 93%
rename from src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationServiceImpl.java
rename to src/main/java/org/woehlke/simpleworklist/user/services/UserRegistrationServiceImpl.java
index 863b46ca..af2ed1c3 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationServiceImpl.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/services/UserRegistrationServiceImpl.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.register;
+package org.woehlke.simpleworklist.user.services;
import java.util.Date;
import java.util.UUID;
@@ -14,7 +14,11 @@
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.woehlke.simpleworklist.application.ApplicationProperties;
-import org.woehlke.simpleworklist.user.token.TokenGeneratorService;
+import org.woehlke.simpleworklist.user.register.UserRegistration;
+import org.woehlke.simpleworklist.user.register.UserRegistrationRepository;
+import org.woehlke.simpleworklist.user.register.UserRegistrationStatus;
+import org.woehlke.simpleworklist.user.services.TokenGeneratorService;
+import org.woehlke.simpleworklist.user.services.UserRegistrationService;
@Slf4j
@Service
diff --git a/src/main/java/org/woehlke/simpleworklist/user/session/UserSessionBean.java b/src/main/java/org/woehlke/simpleworklist/user/session/UserSessionBean.java
index a9b9fdf9..e15b1769 100644
--- a/src/main/java/org/woehlke/simpleworklist/user/session/UserSessionBean.java
+++ b/src/main/java/org/woehlke/simpleworklist/user/session/UserSessionBean.java
@@ -4,7 +4,7 @@
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
-import org.woehlke.simpleworklist.task.TaskState;
+import org.woehlke.simpleworklist.domain.task.TaskState;
import java.io.Serializable;
diff --git a/src/main/resources/templates/layout/page.html b/src/main/resources/templates/layout/page.html
index 192a20bd..65fbf3eb 100644
--- a/src/main/resources/templates/layout/page.html
+++ b/src/main/resources/templates/layout/page.html
@@ -66,7 +66,7 @@
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
deleted file mode 100644
index 8105a128..00000000
--- a/src/site/apt/index.apt
+++ /dev/null
@@ -1,54 +0,0 @@
-SimpleWorklist
-
- Your Todo-List for Getting Things Done
-
-)
-
- Software-Stack: {{{https://spring.io/projects/spring-boot/}Spring-Boot}},{{{https://spring.io/projects/spring-data-jpa}JPA}},{{{https://spring.io/projects/spring-session-jdbc}Spring Session JDBC}},{{{https://docs.spring.io/spring/docs/current/spring-framework-reference/web.html}Spring MVC (Servlet Stack}},{{{https://github.com/thymeleaf/thymeleaf}Thymeleaf},{{{https://getbootstrap.com/docs/4.4/getting-started/introduction/}Bootstrap}},{{{http://jquery.com/}jQuery}}, HTML5
- Repository: {{https://github.com/Spring-Framework-Java-Apps/simpleworklist}}
- Demo: {{https://simpleworklist.herokuapp.com/}}
-
-* Use Cases
-
-** User
-
-[img/Use_Cases_User.jpg] Figure Use Cases User
-
-** Tasks and Projects
-
-[img/Use_Cases_Data.jpg] Figure Use Cases Tasks and Projects
-
-** Use Case: Registration
-
-[img/Registration_Request.jpg] Figure Registration Request
-
-[img/Registration_Perform.jpg] Figure Registration Request
-
-** Use Case: Passwort Recovery
-
-[img/Password_Recovery_Request.jpg] Figure Password Recovery Request
-
-[img/Password_Recovery_Perform.jpg] Figure Password Recovery Perform
-
-* Domain Model
-
-** Entities
-
-[img/Domain_Model.jpg] Figure Domain Model
-
-** Domain Model Details
-
-[img/Domain_Model_Details.jpg] Figure Domain Model Details
-
-** Use Case Details
-
-*** Use Case Details: Registration
-
-[img/Registration_Request_Details.jpg] Figure Registration Request Details
-
-[img/Registration_Perform_Details.jpg] Figure Registration Perform Details
-
-** Database Schema
-
-[img/db-schema.png] Database Schema
-
diff --git a/src/site/markdown/About.md b/src/site/markdown/About.md
new file mode 100644
index 00000000..c486f8f4
--- /dev/null
+++ b/src/site/markdown/About.md
@@ -0,0 +1,59 @@
+# SimpleWorklist
+Your Todo-List for Getting Things Done
+
+## Getting Things Done
+GTD® and Getting Things Done® are registered trademarks of the David Allen Company.
+SimpleWorklist is not affiliated with or endorsed by the David Allen Company.
+
+## Software-Stack:
+* [Spring-Boot](https://spring.io/projects/spring-boot/)
+* [Spring Data JPA](https://spring.io/projects/spring-data-jpa)
+* [Spring Session JDBC](https://spring.io/projects/spring-session-jdbc)
+* [Spring MVC](https://docs.spring.io/spring/docs/current/spring-framework-reference/web.html)
+* [Spring Security](https://spring.io/projects/spring-security)
+* [Thymeleaf](https://github.com/thymeleaf/thymeleaf)
+* [Bootstrap](https://getbootstrap.com/docs/4.4/getting-started/introduction/)
+* [jQuery](http://jquery.com/)
+* HTML5 for Drag and Drop
+
+## Development
+* [Code Repository on Github](https://github.com/Spring-Framework-Java-Apps/simpleworklist)
+* [Live Deployment on Heroku](https://simpleworklist.herokuapp.com/)
+
+## TODO: Requirements
+* See Files [Requirements.md](./Requirements.md) and [Nonfunctional_Requirements.md](./Nonfunctional_Requirements.md)
+
+## Legacy Documentation: Requirements
+
+### Legacy Documentation: Use Cases
+
+#### User Selfservice
+
+
+#### Tasks and Projects
+
+
+### Use Case: User Self Registration
+#### Figure Registration Request Activity
+
+#### Figure Registration Perform Activity
+
+#### Figure Registration Request Sequence
+
+#### Figure Registration Perform Sequence
+
+
+### Use Case: User Passwort Recovery
+#### Figure Password Recovery Request
+
+#### Figure Password Recovery Perform
+
+
+### Domain Model
+#### Entities
+
+#### Domain Model Details
+
+#### Database Schema
+
+
diff --git a/etc/development/Development.md b/src/site/markdown/Development.md
similarity index 100%
rename from etc/development/Development.md
rename to src/site/markdown/Development.md
diff --git a/etc/development/HOWTO.md b/src/site/markdown/HOWTO.md
similarity index 100%
rename from etc/development/HOWTO.md
rename to src/site/markdown/HOWTO.md
diff --git a/etc/development/Maven_Plugins.md b/src/site/markdown/Maven_Plugins.md
similarity index 100%
rename from etc/development/Maven_Plugins.md
rename to src/site/markdown/Maven_Plugins.md
diff --git a/etc/development/Primesfaces_JSF.md b/src/site/markdown/Primesfaces_JSF.md
similarity index 100%
rename from etc/development/Primesfaces_JSF.md
rename to src/site/markdown/Primesfaces_JSF.md
diff --git a/etc/requirements/Requirements.md b/src/site/markdown/Requirements.md
similarity index 60%
rename from etc/requirements/Requirements.md
rename to src/site/markdown/Requirements.md
index 8cc5f91b..fab7f2be 100644
--- a/etc/requirements/Requirements.md
+++ b/src/site/markdown/Requirements.md
@@ -1,12 +1,15 @@
# Functional Requirements
+# Functional Requirements 001 - Start
## F001 Server Starts
## F002 Home Page rendered
## F003 Registration
## F004 Password Recovery
## F005 Login
## F006 Page after first successful Login
+## F007 Logout
+# Functional Requirements 002 - Show TaskstateTab
## F010 show /taskstate/inbox
## F011 show /taskstate/today
## F012 show /taskstate/next
@@ -17,23 +20,7 @@
## F017 show /taskstate/completed
## F018 show /taskstate/trash
-## F020 Drag and Drop: Task move to /taskstate/inbox
-## F021 Drag and Drop: Task move to /taskstate/today
-## F022 Drag and Drop: Task move to /taskstate/next
-## F023 Drag and Drop: Task move to /taskstate/waiting
-## F024 Drag and Drop: Task move to /taskstate/scheduled
-## F025 Drag and Drop: Task move to /taskstate/someday
-## F026 Drag and Drop: Task move to /taskstate/focus
-## F027 Drag and Drop: Task move to /taskstate/completed
-## F028 Drag and Drop: Task move to /taskstate/trash
-
-## F029 Drag and Drop: Task move to Project
-## F030 Drag and Drop: Project move to Project
-
-## F031 Drag and Drop: Move Task to Change Task-Order in Taskstate
-## F032 Drag and Drop: Move Task to Change Task-Order in Project/Root
-## F033 Drag and Drop: Move Task to Change Task-Order in Project/id
-
+# Functional Requirements 003 - TaskstateTab
## F040 Taskstate: Add Task to Inbox
## F041 Taskstate: Add Task to Inbox again
## F042 Taskstate: Task Edit
@@ -47,6 +34,7 @@
## F050 Taskstate: Task delete
## F051 Taskstate: Task undelete
+# Functional Requirements 004 - Project/Root
## F060 Project/Root: Add Task
## F061 Project/Root: Add SubProject
## F062 Project/Root: Task Edit
@@ -60,6 +48,7 @@
## F070 Project/Root: Task delete
## F071 Project/Root: Task undelete
+# Functional Requirements 005 - Project/id
## F080 Project/id: Add Task
## F081 Project/id: Add SubProject
## F082 Project/id: Task Edit
@@ -72,3 +61,26 @@
## F089 Project/id: Task incomplete
## F090 Project/id: Task delete
## F091 Project/id: Task undelete
+
+# Functional Requirements 006 - Drag and Drop. Task move to TaskstateTab
+## F120 Drag and Drop: Task move to /taskstate/inbox
+## F121 Drag and Drop: Task move to /taskstate/today
+## F122 Drag and Drop: Task move to /taskstate/next
+## F123 Drag and Drop: Task move to /taskstate/waiting
+## F124 Drag and Drop: Task move to /taskstate/scheduled
+## F125 Drag and Drop: Task move to /taskstate/someday
+## F126 Drag and Drop: Task move to /taskstate/focus
+## F127 Drag and Drop: Task move to /taskstate/completed
+## F128 Drag and Drop: Task move to /taskstate/trash
+
+# Functional Requirements 007 - Drag and Drop Move to Project
+## F129 Drag and Drop: Task move to Project
+## F130 Drag and Drop: Project move to Project
+
+# Functional Requirements 008 - Drag and Drop Move Task to Change Task-Order
+## F131 Drag and Drop: Move Task to Change Task-Order in TaskstateTab
+## F132 Drag and Drop: Move Task to Change Task-Order in Project/Root
+## F133 Drag and Drop: Move Task to Change Task-Order in Project/id
+
+# Functional Requirements 009 - Search
+## F200 Search Request
diff --git a/src/site/markdown/Requirements_Nonfunctional.md b/src/site/markdown/Requirements_Nonfunctional.md
new file mode 100644
index 00000000..636bd715
--- /dev/null
+++ b/src/site/markdown/Requirements_Nonfunctional.md
@@ -0,0 +1,60 @@
+# Nonfunctional Requirements
+
+## T0001 Runtime Environments
+#### T0001_1 Runtime Environments: Developer Machine
+#### T0001_2 Runtime Environments: Continous Integration
+#### T0001_3 Runtime Environments: Live Deployment
+
+## T0002 Runtime Components
+### T0002_1 PostgreSQL Database
+#### T0002_1_1 PostgreSQL Database Service
+#### T0002_1_2 PostgreSQL Database CLI
+### T0002_2 Embedded Java Servlet Container (Apache Tomcat)
+#### T0002_2_1 Java jdk
+#### T0002_2_2 Maven Wrapper
+#### T0002_2_3 spring-boot
+#### T0002_2_4 spring-boot-web
+#### T0002_2_5 spring-boot-jpa
+#### T0002_2_6 spring-session-jdbc
+#### T0002_2_7 spring-security
+#### T0002_2_8 logging
+#### T0002_2_9 Parameter
+### T0002_3 Frontend Serversite
+#### T0002_3_1 Thymeleaf Template
+#### T0002_3_1 Thymeleaf Template Extensions for Spring-Data, Security, Paging
+#### T0002_3_2 Webjars
+### T0002_4 Frontend Clientsite
+#### T0002_4_1 HTML5 Drag and Drop
+#### T0002_4_2 Web-Browser and Selenium
+##### T0002_4_2_1 Firefox
+##### T0002_4_2_1 Chrome
+
+## T0003 Development and Continous Integration Components
+### T0003_1 Unit and Integration Tests
+### T0003_2 Database Schema Changes
+
+## T0004 SCM and Project-Management: Github
+### T0004_1 Continous Integration Services
+#### T0004_1_1 Continous Integration Services: Github CI
+#### T0004_1_2 Continous Integration Services: Travis
+#### T0004_1_3 Continous Integration Services: Circle CI
+
+## T0005 Live Deployment
+### T0005_1 Deployment on Heroku
+### T0005_2 Deployment on Openshift
+
+## T0006 Development Systems: Local Developer Machine
+### T0006_1 OS: Linux, Windows10
+### T0006_1_1 OS: Linux
+### T0006_1_2 OS: Windows10
+### T0006_1_3 OS: LmacOS
+### T0006_2 bash
+### T0006_3 git
+### T0006_4 java
+### T0006_5 Maven Wrapper
+### T0006_6 Database PostgreSQL
+#### T0006_6_1 PostgreSQL via Docker
+#### T0006_6_2 PostgreSQL via Local Service
+### T0006_7 IDE
+#### T0006_7_1 IntelliJ IDEA
+#### T0006_7_2 SpringToolSuite ( Eclipse )
diff --git a/src/site/site.xml b/src/site/site.xml
index c73c1ad4..e42fee45 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -3,17 +3,39 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+
+
SimpleWorklist
/img/phasenraum_logo.gif
- https://woehlke.org
+ https://woehlke.org/p/simpleworklist
-
-
+
+
+
+
+
+
+
+
+
-
+
+
diff --git a/src/site/uml/SimpleWorklist.mdzip b/src/site/uml/SimpleWorklist.mdzip
new file mode 100644
index 00000000..8a813e14
Binary files /dev/null and b/src/site/uml/SimpleWorklist.mdzip differ
diff --git a/src/site/uml/SimpleWorklist.mdzip.bak b/src/site/uml/SimpleWorklist.mdzip.bak
new file mode 100644
index 00000000..d967621c
Binary files /dev/null and b/src/site/uml/SimpleWorklist.mdzip.bak differ
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 e3cea01e..bfc136fb 100644
--- a/src/test/java/org/woehlke/simpleworklist/application/config/AbstractTest.java
+++ b/src/test/java/org/woehlke/simpleworklist/application/config/AbstractTest.java
@@ -10,10 +10,10 @@
import org.woehlke.simpleworklist.application.ApplicationProperties;
import org.woehlke.simpleworklist.application.helper.TestHelperService;
import org.woehlke.simpleworklist.user.account.UserAccount;
-import org.woehlke.simpleworklist.user.account.UserAccountService;
-import org.woehlke.simpleworklist.user.account.UserAccountAccessService;
-import org.woehlke.simpleworklist.user.account.UserAccountSecurityService;
-import org.woehlke.simpleworklist.user.login.UserAccountLoginSuccessService;
+import org.woehlke.simpleworklist.user.services.UserAccountService;
+import org.woehlke.simpleworklist.user.services.UserAccountAccessService;
+import org.woehlke.simpleworklist.user.services.UserAccountSecurityService;
+import org.woehlke.simpleworklist.user.services.UserAccountLoginSuccessService;
import java.net.URL;
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 32011b1c..ab34e9da 100644
--- a/src/test/java/org/woehlke/simpleworklist/application/config/UserAccountTestDataServiceImpl.java
+++ b/src/test/java/org/woehlke/simpleworklist/application/config/UserAccountTestDataServiceImpl.java
@@ -5,12 +5,12 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.woehlke.simpleworklist.application.ApplicationProperties;
-import org.woehlke.simpleworklist.context.Context;
-import org.woehlke.simpleworklist.context.ContextService;
-import org.woehlke.simpleworklist.context.NewContextForm;
+import org.woehlke.simpleworklist.domain.context.Context;
+import org.woehlke.simpleworklist.services.ContextService;
+import org.woehlke.simpleworklist.domain.context.NewContextForm;
import org.woehlke.simpleworklist.application.language.Language;
import org.woehlke.simpleworklist.user.account.UserAccount;
-import org.woehlke.simpleworklist.user.account.UserAccountService;
+import org.woehlke.simpleworklist.user.services.UserAccountService;
import java.util.Date;
diff --git a/src/test/java/org/woehlke/simpleworklist/application/helper/TestHelperServiceImpl.java b/src/test/java/org/woehlke/simpleworklist/application/helper/TestHelperServiceImpl.java
index 2a50f285..3e5d309d 100644
--- a/src/test/java/org/woehlke/simpleworklist/application/helper/TestHelperServiceImpl.java
+++ b/src/test/java/org/woehlke/simpleworklist/application/helper/TestHelperServiceImpl.java
@@ -3,14 +3,14 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
-import org.woehlke.simpleworklist.project.Project;
-import org.woehlke.simpleworklist.project.ProjectRepository;
+import org.woehlke.simpleworklist.domain.project.Project;
+import org.woehlke.simpleworklist.domain.project.ProjectRepository;
import org.woehlke.simpleworklist.user.register.UserRegistrationRepository;
import org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecovery;
import org.woehlke.simpleworklist.user.register.UserRegistration;
import org.springframework.beans.factory.annotation.Autowired;
-import org.woehlke.simpleworklist.task.TaskRepository;
+import org.woehlke.simpleworklist.domain.task.TaskRepository;
import org.woehlke.simpleworklist.user.account.UserAccountRepository;
import org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecoveryRepository;
diff --git a/src/test/java/org/woehlke/simpleworklist/application/testdata/TestDataServiceTest.java b/src/test/java/org/woehlke/simpleworklist/application/testdata/TestDataServiceTest.java
index 52993e6d..8058ebe0 100644
--- a/src/test/java/org/woehlke/simpleworklist/application/testdata/TestDataServiceTest.java
+++ b/src/test/java/org/woehlke/simpleworklist/application/testdata/TestDataServiceTest.java
@@ -11,6 +11,7 @@
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.web.context.WebApplicationContext;
import org.woehlke.simpleworklist.application.config.UserAccountTestDataService;
+import org.woehlke.simpleworklist.application.testdata.services.TestDataService;
import org.woehlke.simpleworklist.user.account.UserAccount;
import java.net.URL;
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 840f5e98..be615343 100644
--- a/src/test/java/org/woehlke/simpleworklist/user/account/UserAccountServiceImplTest.java
+++ b/src/test/java/org/woehlke/simpleworklist/user/account/UserAccountServiceImplTest.java
@@ -9,8 +9,8 @@
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
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.services.UserPasswordRecoveryService;
+import org.woehlke.simpleworklist.user.services.UserRegistrationService;
import org.woehlke.simpleworklist.user.login.LoginForm;
import static org.junit.jupiter.api.Assertions.*;
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 9570dbe3..ca8bb8a8 100644
--- a/src/test/java/org/woehlke/simpleworklist/user/register/UserRegistrationControllerTest.java
+++ b/src/test/java/org/woehlke/simpleworklist/user/register/UserRegistrationControllerTest.java
@@ -3,6 +3,7 @@
import org.woehlke.simpleworklist.application.config.AbstractTest;
import org.springframework.beans.factory.annotation.Autowired;
+import org.woehlke.simpleworklist.user.services.UserRegistrationService;
import static org.hamcrest.Matchers.containsString;
import static org.junit.jupiter.api.Assertions.assertNotNull;
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 7b274b7e..d8c66883 100644
--- a/src/test/java/org/woehlke/simpleworklist/user/register/UserRegistrationServiceImplTest.java
+++ b/src/test/java/org/woehlke/simpleworklist/user/register/UserRegistrationServiceImplTest.java
@@ -3,9 +3,11 @@
import org.springframework.beans.factory.annotation.Value;
import org.woehlke.simpleworklist.application.config.AbstractTest;
import org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecovery;
-import org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecoveryService;
+import org.woehlke.simpleworklist.user.services.UserPasswordRecoveryService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.woehlke.simpleworklist.user.services.UserRegistrationService;
+
import java.util.Date;
import static org.junit.jupiter.api.Assertions.*;
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 32fb952f..1c47656b 100644
--- a/src/test/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryControllerTest.java
+++ b/src/test/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryControllerTest.java
@@ -3,6 +3,7 @@
import org.woehlke.simpleworklist.application.config.AbstractTest;
import org.springframework.beans.factory.annotation.Autowired;
+import org.woehlke.simpleworklist.user.services.UserPasswordRecoveryService;
import static org.hamcrest.Matchers.containsString;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/system.properties b/system.properties
index 5e8606c8..9146af53 100644
--- a/system.properties
+++ b/system.properties
@@ -1 +1 @@
-java.runtime.version=1.8
+java.runtime.version=11