diff --git a/.editorconfig b/.editorconfig index bd0760ed..4afff25a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -5,7 +5,7 @@ root = true [*] charset = utf-8 end_of_line = lf -indent_size = 4 +indent_size = 2 indent_style = space insert_final_newline = true trim_trailing_whitespace = true @@ -27,4 +27,4 @@ end_of_line = lf indent_size = 3 indent_style = space insert_final_newline = false -trim_trailing_whitespace = true \ No newline at end of file +trim_trailing_whitespace = true diff --git a/.gitignore b/.gitignore index 5e37d9d6..a66a3aee 100644 --- a/.gitignore +++ b/.gitignore @@ -33,7 +33,7 @@ setenv.cmd /src/main/java/org/woehlke/simpleworklist/project/x.txt /src/main/java/org/woehlke/simpleworklist/task/x.txt /src/main/java/org/woehlke/simpleworklist/context/x.txt -/src/main/java/org/woehlke/simpleworklist/application/error/x.txt +/src/main/java/org/woehlke/java/simpleworklist/application/error/x.txt /src/main/java/org/woehlke/simpleworklist/searchRequest/x.txt /simpleworklist.diff diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index 9cce3d47..76249ea8 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -1,6 +1,11 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/etc/db/setup-postgresql-account-and-db.sql b/etc/db/setup-postgresql-account-and-db.sql index 2e524810..97fc0614 100644 --- a/etc/db/setup-postgresql-account-and-db.sql +++ b/etc/db/setup-postgresql-account-and-db.sql @@ -20,6 +20,10 @@ CREATE TABLESPACE tablespace_simpleworklist OWNER tw LOCATION '/opt/postgresql/tablespace_simpleworklist'; +CREATE TABLESPACE tablespace_simpleworklist + OWNER tw + LOCATION 'C:\tablespace_pg\simpleworklist'; + ALTER TABLESPACE tablespace_simpleworklist OWNER TO simpleworklist; @@ -34,38 +38,3 @@ CREATE DATABASE simpleworklistref ENCODING = 'UTF8' TABLESPACE = tablespace_simpleworklist CONNECTION LIMIT = -1; - - - - - - -CREATE ROLE petclinic_jakartaee LOGIN - PASSWORD 'petclinic_jakartaeepwd' - SUPERUSER INHERIT CREATEDB CREATEROLE REPLICATION; -GRANT pg_monitor TO petclinic_jakartaee; -GRANT pg_read_all_settings TO petclinic_jakartaee; -GRANT pg_read_all_stats TO petclinic_jakartaee; -GRANT pg_signal_backend TO petclinic_jakartaee; -GRANT pg_stat_scan_tables TO petclinic_jakartaee; - - --- Database: petclinic_jakartaee - --- DROP DATABASE petclinic_jakartaee; --- CONNECTION LIMIT = -1; - -CREATE TABLESPACE tablespace_petclinic_jakartae - OWNER tw - LOCATION '/opt/postgresql/tablespace_petclinic_jakartae'; - -ALTER TABLESPACE tablespace_petclinic_jakartae - OWNER TO simpleworklist; - -CREATE DATABASE petclinic_jakartaee - WITH OWNER = petclinic_jakartaee - ENCODING = 'UTF8' - TABLESPACE = tablespace_petclinic_jakartae - CONNECTION LIMIT = -1; - - diff --git a/pom.xml b/pom.xml index a5dff8f2..a62efef1 100644 --- a/pom.xml +++ b/pom.xml @@ -1,1920 +1,1880 @@ - 4.0.0 + 4.0.0 - org.woehlke - simpleworklist - 2.3.46-SNAPSHOT - jar + org.woehlke + simpleworklist + 2.3.49-SNAPSHOT + jar - - org.springframework.boot - spring-boot-starter-parent - 2.7.2 - + + org.springframework.boot + spring-boot-starter-parent + 2.7.2 + - - scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git - scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git - https://github.com/Spring-Framework-Java-Apps/simpleworklist/tree/${project.scm.tag} - head - + + scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git + scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git + https://github.com/Spring-Framework-Java-Apps/simpleworklist/tree/${project.scm.tag} + head + - simpleworklist - Your Todo-List for Getting Things Done - https://homepage.ruhr-uni-bochum.de/Thomas.Woehlke/java/simpleworklist - 2012 + simpleworklist + Your Todo-List for Getting Things Done + https://woehlke.org/java/simpleworklist + 2012 - - Spring-Framework-Java-Apps - https://github.com/Spring-Framework-Java-Apps/ - - - - Thomas Wöhlke - github@woehlke.org - https://github.com/thomaswoehlke/ - - + + Spring-Framework-Java-Apps + https://github.com/Spring-Framework-Java-Apps/ + - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + + + Thomas Wöhlke + github@woehlke.org + https://github.com/thomaswoehlke/ + + - - Github - https://github.com/Spring-Framework-Java-Apps/simpleworklist/issues - + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + - - - simpleworklist.public_html - file://${user.home}/public_html/java/simpleworklist - - - snapshots - tw-thinkpad-snapshots - file://${user.home}/public_html/java/libs-snapshot-local - - - central - tw-thinkpad-releases - file://${user.home}/public_html/java/libs-release-local - - + + Github + https://github.com/Spring-Framework-Java-Apps/simpleworklist/issues + - - 11 - 3.6.3 - 6.46.0 + + + org.woehlke.java.simpleworklist + file://${user.home}/public_html/java/simpleworklist + + + + central + tw-thinkpad-releases + file://${user.home}/public_html/java/libs-release-local + + + snapshots + tw-thinkpad-snapshots + file://${user.home}/public_html/java/libs-snapshot-local + + - ${java.version} - ${java.version} + + 11 + 3.6.3 + 6.46.0 - JAR + ${java.version} + ${java.version} - ${project.parent.version} + JAR - 3.1.0.M2 - 3.5.0 + ${project.parent.version} - - 3.6.0 - 2.9.3 - 5.1.3 - 6.1.1 - 31.0.0 - 5.3 + 3.1.0.M2 + 3.5.0 - - true - 2.6.4 - 2.6.4 - 2.43.0 - 2.4.21 - 2.2 - 1.14.2 + + 3.6.0 + 2.9.3 + 5.1.3 + 6.1.1 + 31.0.0 + 5.3 - - 1.13.0 + + true + 2.9.0 + 2.63.0 + 2.4.21 + 2.2 + 1.14.2 - - 4.0.0 - true - true - true - true - true + + 1.13.0 - 3.0.0-M6 - - 4.12.0 - ${project.basedir}/liquibase.properties + + 4.0.0 + true + true + true + true + true - - 3.12.0 - 3.3.0 - 3.1.2 - 3.2.0 - 3.17.0 - 4.7.0.0 - 3.0.0-M7 - 2.2.2 - 1.11.1 - 3.1.0 - + 3.0.0-M6 - - - 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/ - - - - apache-releases - Apache Releases - https://repository.apache.org/content/repositories/releases/ - - - 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/ - - - - adobe-public - AdobePublic Repository - https://repo.adobe.com/nexus/content/repositories/public/ - - - atlassian-3rdparty - Atlassian 3rd-P Old Repository - https://packages.atlassian.com/3rdparty/ - - - - - 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/ - - - - apache-releases - Apache Releases - https://repository.apache.org/content/repositories/releases/ - - - 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/ - - - - adobe-public - AdobePublic Repository - https://repo.adobe.com/nexus/content/repositories/public/ - - - atlassian-3rdparty - Atlassian 3rd-P Old Repository - https://packages.atlassian.com/3rdparty/ - - + + 3.12.0 + 3.3.0 + 3.1.2 + 3.2.0 + 3.17.0 + 4.7.0.0 + 3.0.0-M7 + 2.2.2 + 1.11.1 + 3.1.0 + - - - - org.junit - junit-bom - ${junit-jupiter.version} - pom - import - - - org.springframework.session - spring-session-bom - ${spring-session-bom.version} - pom - import - - - org.springframework - spring-framework-bom - ${spring-framework.version} - pom - import - - - org.springframework.security - spring-security-bom - ${spring-security.version} - pom - import - - - org.springframework.integration - spring-integration-bom - ${spring-integration.version} - pom - import - - - org.springframework.integration - spring-integration-ws - ${spring-integration.version} - + + + 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/ + + + + apache-releases + Apache Releases + https://repository.apache.org/content/repositories/releases/ + + + 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/ + + + + adobe-public + AdobePublic Repository + https://repo.adobe.com/nexus/content/repositories/public/ + + + atlassian-3rdparty + Atlassian 3rd-P Old Repository + https://packages.atlassian.com/3rdparty/ + + + + + 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/ + + + + apache-releases + Apache Releases + https://repository.apache.org/content/repositories/releases/ + + + 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/ + + + + adobe-public + AdobePublic Repository + https://repo.adobe.com/nexus/content/repositories/public/ + + + atlassian-3rdparty + Atlassian 3rd-P Old Repository + https://packages.atlassian.com/3rdparty/ + + - - - org.webjars - jquery - ${webjars.jquery.version} - - - org.webjars - popper.js - ${webjars.popper.js.version} - - - org.webjars - bootstrap - ${webjars.bootstrap.version} - - - org.webjars - font-awesome - ${webjars.font-awesome.version} - - - org.webjars - ckeditor - ${webjars.ckeditor.version} - + + + + org.junit + junit-bom + ${junit-jupiter.version} + pom + import + + + org.springframework.session + spring-session-bom + ${spring-session-bom.version} + pom + import + + + org.springframework + spring-framework-bom + ${spring-framework.version} + pom + import + + + org.springframework.security + spring-security-bom + ${spring-security.version} + pom + import + + + org.springframework.integration + spring-integration-bom + ${spring-integration.version} + pom + import + + + org.springframework.integration + spring-integration-ws + ${spring-integration.version} + - - - org.thymeleaf - thymeleaf-testing - ${thymeleaf-testing.version} - test - - - io.github.jpenren - thymeleaf-spring-data-dialect - ${thymeleaf-spring-data-dialect.version} - + + + org.webjars + jquery + ${webjars.jquery.version} + + + org.webjars + popper.js + ${webjars.popper.js.version} + + + org.webjars + bootstrap + ${webjars.bootstrap.version} + + + org.webjars + font-awesome + ${webjars.font-awesome.version} + + + org.webjars + ckeditor + ${webjars.ckeditor.version} + - - - org.projectlombok - lombok - ${lombok.version} - false - - - org.hamcrest - hamcrest - ${hamcrest.version} - test - - - org.hamcrest - hamcrest-core - ${hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${hamcrest.version} - test - + + + org.thymeleaf + thymeleaf-testing + ${thymeleaf-testing.version} + test + + + io.github.jpenren + thymeleaf-spring-data-dialect + ${thymeleaf-spring-data-dialect.version} + - - org.jsoup - jsoup - ${jsoup.version} - + + + org.projectlombok + lombok + ${lombok.version} + false + + + org.hamcrest + hamcrest + ${hamcrest.version} + test + + + org.hamcrest + hamcrest-core + ${hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${hamcrest.version} + test + - - - org.apache.maven.scm - maven-scm-providers-standard - ${version.org.apache.maven.scm} - pom - - - org.apache.maven.scm - maven-scm-provider-svnexe - ${version.org.apache.maven.scm} - provided - - - org.apache.maven.scm - maven-scm-provider-svn-commons - ${version.org.apache.maven.scm} - provided - - - org.apache.maven.scm - maven-scm-provider-gitexe - ${version.org.apache.maven.scm} - provided - - - org.apache.maven.scm - maven-scm-provider-git-commons - ${version.org.apache.maven.scm} - provided - - - org.apache.maven.scm - maven-scm-manager-plexus - ${version.org.apache.maven.scm} - provided - - - org.apache.maven.scm - maven-scm-client - ${version.org.apache.maven.scm} - provided - + + org.jsoup + jsoup + ${jsoup.version} + - - - org.apache.maven.plugins - maven-enforcer-plugin - ${maven-enforcer-plugin.version} - maven-plugin - provided - - - org.apache.maven.plugins - maven-invoker-plugin - ${maven-invoker-plugin.version} - maven-plugin - provided - - - com.dkanejs.maven.plugins - docker-compose-maven-plugin - ${docker-compose-maven-plugin.version} - maven-plugin - provided - - - org.apache.maven.plugins - maven-clean-plugin - ${maven-clean-plugin.version} - maven-plugin - provided - - - org.apache.maven.plugins - maven-dependency-plugin - ${maven-dependency-plugin.version} - maven-plugin - provided - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - maven-plugin - provided - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot-maven-plugin.version} - maven-plugin - provided - - - org.apache.maven.plugins - maven-site-plugin - ${maven-site-plugin.version} - maven-plugin - provided - - - org.apache.maven.plugins - maven-project-info-reports-plugin - ${maven-project-info-reports-plugin.version} - maven-plugin - provided - - - org.apache.maven.plugins - maven-jxr-plugin - ${maven-jxr-plugin.version} - maven-plugin - provided - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${maven-checkstyle-plugin.version} - maven-plugin - provided - - - com.github.spotbugs - spotbugs-maven-plugin - ${spotbugs-maven-plugin.version} - maven-plugin - provided - - - org.apache.maven.plugins - maven-pmd-plugin - ${maven-pmd-plugin.version} - maven-plugin - provided - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - maven-plugin - provided - - - org.apache.maven.plugins - maven-surefire-report-plugin - ${maven-surefire-report-plugin.version} - maven-plugin - provided - - - org.asciidoctor - asciidoctor-maven-plugin - ${asciidoctor-maven-plugin.version} - maven-plugin - provided - - - org.liquibase - liquibase-maven-plugin - ${liquibase-maven-plugin.version} - maven-plugin - provided - - - org.apache.maven.plugins - maven-release-plugin - ${maven-release-plugin.version} - maven-plugin - provided - - - org.apache.maven.plugins - maven-deploy-plugin - ${maven-deploy-plugin.version} - maven-plugin - provided - - - org.apache.maven.plugins - maven-install-plugin - ${maven-install-plugin.version} - maven-plugin - provided - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - maven-plugin - provided - - - org.apache.maven.plugins - maven-source-plugin - ${maven-source-plugin.version} - maven-plugin - provided - + + + org.apache.maven.scm + maven-scm-providers-standard + ${version.org.apache.maven.scm} + pom + + + org.apache.maven.scm + maven-scm-provider-svnexe + ${version.org.apache.maven.scm} + provided + + + org.apache.maven.scm + maven-scm-provider-svn-commons + ${version.org.apache.maven.scm} + provided + + + org.apache.maven.scm + maven-scm-provider-gitexe + ${version.org.apache.maven.scm} + provided + + + org.apache.maven.scm + maven-scm-provider-git-commons + ${version.org.apache.maven.scm} + provided + + + org.apache.maven.scm + maven-scm-manager-plexus + ${version.org.apache.maven.scm} + provided + + + org.apache.maven.scm + maven-scm-client + ${version.org.apache.maven.scm} + provided + - - org.apache.maven.doxia - doxia-module-markdown - ${doxia-module-markdown.version} - provided - + + + org.apache.maven.plugins + maven-enforcer-plugin + ${maven-enforcer-plugin.version} + maven-plugin + provided + + + org.apache.commons + commons-collections4 + 4.3 + provided + + + org.apache.maven.plugins + maven-invoker-plugin + ${maven-invoker-plugin.version} + maven-plugin + provided + + + commons-collections + commons-collections + + + + + com.dkanejs.maven.plugins + docker-compose-maven-plugin + ${docker-compose-maven-plugin.version} + maven-plugin + provided + + + org.apache.maven.plugins + maven-clean-plugin + ${maven-clean-plugin.version} + maven-plugin + provided + + + org.apache.maven.plugins + maven-dependency-plugin + ${maven-dependency-plugin.version} + maven-plugin + provided + + + commons-collections + commons-collections + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + maven-plugin + provided + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot-maven-plugin.version} + maven-plugin + provided + + + org.apache.maven.plugins + maven-site-plugin + ${maven-site-plugin.version} + maven-plugin + provided + + + org.apache.maven.plugins + maven-project-info-reports-plugin + ${maven-project-info-reports-plugin.version} + maven-plugin + provided + + + org.apache.maven.plugins + maven-jxr-plugin + ${maven-jxr-plugin.version} + maven-plugin + provided + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${maven-checkstyle-plugin.version} + maven-plugin + provided + + + com.google.guava + guava + + + + + com.github.spotbugs + spotbugs-maven-plugin + ${spotbugs-maven-plugin.version} + maven-plugin + provided + + + org.apache.maven.plugins + maven-pmd-plugin + ${maven-pmd-plugin.version} + maven-plugin + provided + + + com.beust + jcommander + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + maven-plugin + provided + + + org.apache.maven.plugins + maven-surefire-report-plugin + ${maven-surefire-report-plugin.version} + maven-plugin + provided + + + org.asciidoctor + asciidoctor-maven-plugin + ${asciidoctor-maven-plugin.version} + maven-plugin + provided + + + org.apache.maven.plugins + maven-release-plugin + ${maven-release-plugin.version} + maven-plugin + provided + + + com.jcraft + jsch + + + + + org.apache.maven.plugins + maven-deploy-plugin + ${maven-deploy-plugin.version} + maven-plugin + provided + + + org.apache.maven.plugins + maven-install-plugin + ${maven-install-plugin.version} + maven-plugin + provided + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + maven-plugin + provided + + + org.apache.maven.plugins + maven-source-plugin + ${maven-source-plugin.version} + maven-plugin + provided + - - org.xmlunit - xmlunit-core - ${xmlunit.version} - test - - - net.sourceforge.htmlunit - htmlunit - ${htmlunit.version} - test - - - org.codehaus.groovy - groovy-all - ${groovy-all.version} - test - - - + + org.apache.maven.doxia + doxia-module-markdown + ${doxia-module-markdown.version} + provided + - - - org.projectlombok - lombok - provided - false - - - org.springframework.boot - spring-boot-devtools - true - - - org.springframework.boot - spring-boot-configuration-processor - true - - - - org.springframework.boot - spring-boot-starter-jta-atomikos - - - org.springframework.boot - spring-boot-starter-data-jdbc - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-data-rest - - - org.springframework.boot - spring-boot-starter-hateoas - - - org.springframework.boot - spring-boot-starter-jersey - - - org.springframework.boot - spring-boot-starter-jdbc - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-starter-mail - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-test - test - - - junit - junit - - - org.junit.vintage - junit-vintage-engine - - - - - org.springframework.boot - spring-boot-starter-logging - - - org.springframework.boot - spring-boot-starter-web-services - - - org.springframework.boot - spring-boot-starter-oauth2-resource-server - - - org.springframework.boot - spring-boot-starter-cache - - - org.springframework.boot - spring-boot-starter-json - - - org.springframework.boot - spring-boot-starter-integration - - - - org.springframework - spring-core - - - org.springframework - spring-beans - compile - - - org.springframework - spring-context - - - org.springframework - spring-context-support - - - org.springframework - spring-web - - - org.springframework - spring-webmvc - - - org.springframework - spring-tx - - - org.springframework - spring-jdbc - - - org.springframework - spring-orm - - - org.springframework - spring-expression - - - org.springframework - spring-oxm - - - org.springframework.ws - spring-ws-core - - - org.springframework.ws - spring-xml - - - org.springframework.ws - spring-ws-security - - - org.springframework.ws - spring-ws-test - test - - - org.springframework.ws - spring-ws-support - - - org.springframework.security - spring-security-core - - - org.springframework.security - spring-security-config - - - org.springframework.security - spring-security-remoting - - - org.springframework.security - spring-security-web - - - org.springframework.security - spring-security-data - - - org.springframework.session - spring-session-core - - - org.springframework.session - spring-session-jdbc - - - org.springframework.data - spring-data-commons - + + org.xmlunit + xmlunit-legacy + ${xmlunit.version} + test + + + net.sourceforge.htmlunit + htmlunit + ${htmlunit.version} + test + + + org.codehaus.groovy + groovy-all + ${groovy-all.version} + test + + + - - org.springframework.security - spring-security-test - test - + + + org.projectlombok + lombok + provided + false + + + org.springframework.boot + spring-boot-devtools + true + + + org.springframework.boot + spring-boot-configuration-processor + true + + + + org.springframework.boot + spring-boot-starter-jta-atomikos + + + org.springframework.boot + spring-boot-starter-data-jdbc + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-jdbc + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-mail + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-test + test + + + junit + junit + + + org.junit.vintage + junit-vintage-engine + + + + + org.springframework.boot + spring-boot-starter-logging + + + org.springframework.boot + spring-boot-starter-cache + + + + org.springframework + spring-core + + + org.springframework + spring-beans + compile + + + org.springframework + spring-context + + + org.springframework + spring-context-support + + + org.springframework + spring-web + + + org.springframework + spring-webmvc + + + org.springframework + spring-tx + + + org.springframework + spring-jdbc + + + org.springframework + spring-orm + + + org.springframework + spring-expression + + + org.springframework.security + spring-security-core + + + org.springframework.security + spring-security-config + + + org.springframework.security + spring-security-remoting + + + org.springframework.security + spring-security-web + + + org.springframework.security + spring-security-data + + + org.springframework.session + spring-session-core + + + org.springframework.session + spring-session-jdbc + + + org.springframework.data + spring-data-commons + - - - org.webjars - jquery - - - org.webjars - popper.js - - - org.webjars - bootstrap - - - org.webjars - font-awesome - - - org.webjars - ckeditor - + + org.springframework.security + spring-security-test + test + - - org.postgresql - postgresql - provided - + + + org.webjars + jquery + + + org.webjars + popper.js + + + org.webjars + bootstrap + + + org.webjars + font-awesome + + + org.webjars + ckeditor + - - org.thymeleaf - thymeleaf - - - org.slf4j - jul-to-slf4j - - - - - org.thymeleaf - thymeleaf-spring5 - - - org.thymeleaf.extras - thymeleaf-extras-java8time - - - org.thymeleaf.extras - thymeleaf-extras-springsecurity5 - - - com.github.mxab.thymeleaf.extras - thymeleaf-extras-data-attribute - - - io.github.jpenren - thymeleaf-spring-data-dialect - - - org.thymeleaf - thymeleaf-testing - provided - + + org.postgresql + postgresql + provided + - - org.hibernate - hibernate-core - - - javax.xml.bind - jaxb-api - + + org.thymeleaf + thymeleaf + + + org.slf4j + jul-to-slf4j + + + + + org.thymeleaf + thymeleaf-spring5 + + + org.thymeleaf.extras + thymeleaf-extras-java8time + + + org.thymeleaf.extras + thymeleaf-extras-springsecurity5 + + + com.github.mxab.thymeleaf.extras + thymeleaf-extras-data-attribute + + + io.github.jpenren + thymeleaf-spring-data-dialect + + + org.thymeleaf + thymeleaf-testing + provided + - - org.jsoup - jsoup - + + org.hibernate + hibernate-core + - - - org.junit.jupiter - junit-jupiter-engine - test - - - org.junit.jupiter - junit-jupiter-api - test - + + org.jsoup + jsoup + - - org.hamcrest - hamcrest - test - - - org.hamcrest - hamcrest-core - test - - - org.hamcrest - hamcrest-library - test - - - org.xmlunit - xmlunit-core - - - net.sourceforge.htmlunit - htmlunit - + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.junit.jupiter + junit-jupiter-api + test + - - - org.apache.maven.scm - maven-scm-provider-svnexe - provided - - - org.apache.maven.scm - maven-scm-provider-svn-commons - provided - - - org.apache.maven.scm - maven-scm-provider-gitexe - provided - - - org.apache.maven.scm - maven-scm-provider-git-commons - provided - - - org.apache.maven.scm - maven-scm-manager-plexus - provided - - - org.apache.maven.scm - maven-scm-client - provided - + + org.hamcrest + hamcrest + test + + + org.hamcrest + hamcrest-core + test + + + org.hamcrest + hamcrest-library + test + + + org.xmlunit + xmlunit-legacy + test + + + net.sourceforge.htmlunit + htmlunit + test + - - - org.apache.maven.plugins - maven-enforcer-plugin - maven-plugin - provided - - - org.apache.maven.plugins - maven-invoker-plugin - maven-plugin - provided - - - com.dkanejs.maven.plugins - docker-compose-maven-plugin - maven-plugin - provided - - - org.apache.maven.plugins - maven-clean-plugin - maven-plugin - provided - - - org.apache.maven.plugins - maven-dependency-plugin - maven-plugin - provided - - - org.apache.maven.plugins - maven-compiler-plugin - maven-plugin - provided - - - org.springframework.boot - spring-boot-maven-plugin - maven-plugin - provided - - - org.apache.maven.plugins - maven-site-plugin - maven-plugin - provided - - - org.apache.maven.plugins - maven-project-info-reports-plugin - maven-plugin - provided - - - org.apache.maven.plugins - maven-jxr-plugin - maven-plugin - provided - - - org.apache.maven.plugins - maven-checkstyle-plugin - maven-plugin - provided - - - com.github.spotbugs - spotbugs-maven-plugin - maven-plugin - provided - - - org.apache.maven.plugins - maven-pmd-plugin - maven-plugin - provided - - - org.apache.maven.plugins - maven-surefire-plugin - maven-plugin - provided - - - org.apache.maven.plugins - maven-surefire-report-plugin - maven-plugin - provided - - - org.asciidoctor - asciidoctor-maven-plugin - maven-plugin - provided - - - org.liquibase - liquibase-maven-plugin - maven-plugin - provided - - - org.apache.maven.plugins - maven-release-plugin - maven-plugin - provided - - - org.apache.maven.plugins - maven-deploy-plugin - maven-plugin - provided - - - org.apache.maven.plugins - maven-install-plugin - maven-plugin - provided - - - org.apache.maven.plugins - maven-javadoc-plugin - maven-plugin - provided - - - org.apache.maven.plugins - maven-source-plugin - maven-plugin - provided - - - org.apache.maven.doxia - doxia-module-markdown - provided - - - org.codehaus.groovy - groovy-all - test - - + + + org.apache.maven.scm + maven-scm-provider-svnexe + provided + + + org.apache.maven.scm + maven-scm-provider-svn-commons + provided + + + org.apache.maven.scm + maven-scm-provider-gitexe + provided + + + org.apache.maven.scm + maven-scm-provider-git-commons + provided + + + org.apache.maven.scm + maven-scm-manager-plexus + provided + + + org.apache.maven.scm + maven-scm-client + provided + + + + + org.apache.maven.plugins + maven-enforcer-plugin + maven-plugin + provided + + + org.apache.commons + commons-collections4 + 4.3 + provided + + + org.apache.maven.plugins + maven-invoker-plugin + maven-plugin + provided + + + com.dkanejs.maven.plugins + docker-compose-maven-plugin + maven-plugin + provided + + + org.apache.maven.plugins + maven-clean-plugin + maven-plugin + provided + + + org.apache.maven.plugins + maven-dependency-plugin + maven-plugin + provided + + + org.apache.maven.plugins + maven-compiler-plugin + maven-plugin + provided + + + org.springframework.boot + spring-boot-maven-plugin + maven-plugin + provided + + + org.apache.maven.plugins + maven-site-plugin + maven-plugin + provided + + + org.apache.maven.plugins + maven-project-info-reports-plugin + maven-plugin + provided + + + org.apache.maven.plugins + maven-jxr-plugin + maven-plugin + provided + + + org.apache.maven.plugins + maven-checkstyle-plugin + maven-plugin + provided + + + com.github.spotbugs + spotbugs-maven-plugin + maven-plugin + provided + + + org.apache.maven.plugins + maven-pmd-plugin + maven-plugin + provided + + + org.apache.maven.plugins + maven-surefire-plugin + maven-plugin + provided + + + org.apache.maven.plugins + maven-surefire-report-plugin + maven-plugin + provided + + + org.asciidoctor + asciidoctor-maven-plugin + maven-plugin + provided + + + org.apache.maven.plugins + maven-release-plugin + maven-plugin + provided + + + org.apache.maven.plugins + maven-deploy-plugin + maven-plugin + provided + + + org.apache.maven.plugins + maven-install-plugin + maven-plugin + provided + + + org.apache.maven.plugins + maven-javadoc-plugin + maven-plugin + provided + + + org.apache.maven.plugins + maven-source-plugin + maven-plugin + provided + + + org.apache.maven.doxia + doxia-module-markdown + provided + + + org.codehaus.groovy + groovy-all + test + + - - ${project.artifactId} - clean dependency:tree package spring-boot:run - - - - org.apache.maven.plugins - maven-enforcer-plugin - ${maven-enforcer-plugin.version} - - - org.apache.maven.plugins - maven-invoker-plugin - ${maven-invoker-plugin.version} - - - com.dkanejs.maven.plugins - docker-compose-maven-plugin - ${docker-compose-maven-plugin.version} - - - org.apache.maven.plugins - maven-clean-plugin - ${maven-clean-plugin.version} - - - org.apache.maven.plugins - maven-dependency-plugin - ${maven-dependency-plugin.version} - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot-maven-plugin.version} - - - org.apache.maven.plugins - maven-install-plugin - ${maven-install-plugin.version} - - - org.apache.maven.plugins - maven-project-info-reports-plugin - ${maven-project-info-reports-plugin.version} - - - org.apache.maven.plugins - maven-jxr-plugin - ${maven-jxr-plugin.version} - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${maven-checkstyle-plugin.version} - - - com.github.spotbugs - spotbugs-maven-plugin - ${spotbugs-maven-plugin.version} - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - org.apache.maven.plugins - maven-surefire-report-plugin - ${maven-surefire-report-plugin.version} - - - org.apache.maven.plugins - maven-release-plugin - ${maven-release-plugin.version} - - - org.asciidoctor - asciidoctor-maven-plugin - ${asciidoctor-maven-plugin.version} - - - org.liquibase - liquibase-maven-plugin - ${liquibase.version} - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - - org.apache.maven.plugins - maven-pmd-plugin - ${maven-pmd-plugin.version} - - - net.sourceforge.pmd - pmd-core - ${pmdVersion} - compile - - - net.sourceforge.pmd - pmd-java - ${pmdVersion} - compile - - - net.sourceforge.pmd - pmd-javascript - ${pmdVersion} - compile - - - net.sourceforge.pmd - pmd-jsp - ${pmdVersion} - compile - - - - - org.apache.maven.plugins - maven-source-plugin - ${maven-source-plugin.version} - - - org.apache.maven.plugins - maven-site-plugin - ${maven-site-plugin.version} - - - - org.apache.maven.plugins - maven-deploy-plugin - ${maven-deploy-plugin.version} - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-failsafe-plugin.version} - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-versions - - enforce - - - - - ERROR - - org.apache.maven.plugins:maven-verifier-plugin - - - Please consider using the maven-invoker-plugin - (http://maven.apache.org/plugins/maven-invoker-plugin/)! - - - - ${version.maven} - - - ${java.version} - - - - ${project.basedir}/README.md - ${project.basedir}/LICENSE - ${project.basedir}/src/main/docker/docker-compose.yml - ${project.basedir}/app.json - ${project.basedir}/_config.yml - ${project.basedir}/Procfile - ${project.basedir}/src/site/markdown/ABOUT.md - ${project.basedir}/src/site/markdown/CHANGELOG.md - ${project.basedir}/src/site/markdown/CLOUD_DEPLOYMENT.md - ${project.basedir}/src/site/markdown/DEVELOPMENT.md - ${project.basedir}/src/site/markdown/HOWTO.md - ${project.basedir}/src/site/markdown/MAVEN_PLUGINS.md - ${project.basedir}/src/site/markdown/REQUIREMENTS_FUNCTIONAL.md - ${project.basedir}/src/site/markdown/REQUIREMENTS_NONFUNCTIONAL.md - ${project.basedir}/src/site/markdown/TODO.md - ${project.basedir}/src/site/site.xml - ${project.basedir}/etc/build.sh - ${project.basedir}/etc/run.sh - ${project.basedir}/src/main/bash/psql.sh - ${project.basedir}/etc/docker-start.sh - ${project.basedir}/etc/docker-stop.sh - ${project.basedir}/src/main/sql/db-createdb-and-user-linux.sql - ${project.basedir}/src/main/sql/db-createdb-and-user-win10.sql - - - - - - - - - org.apache.maven.plugins - maven-invoker-plugin - - - integration-test - - install - run - - - src/it/settings.xml - ${project.build.directory}/it - ${project.build.directory}/it-repo - verify - - - - - - org.springframework.boot - spring-boot-maven-plugin - - true - true - - - org.springframework.boot - spring-boot-configuration-processor - - - - - - unpack-dependency-classes-install - install - - repackage - - - - id-build-info - process-resources - - build-info - - - - ${project.build.sourceEncoding} - ${project.reporting.outputEncoding} - ${maven.compiler.source} - ${maven.compiler.target} - - - - - - - com.dkanejs.maven.plugins - docker-compose-maven-plugin - - ${project.basedir}/src/main/docker/docker-compose.yml - ${docker-compose-maven-plugin.verbose} - ${docker-compose-maven-plugin.removeImages} - ${docker-compose-maven-plugin.removeVolumes} - ${docker-compose-maven-plugin.ignorePullFailures} - ${docker-compose-maven-plugin.detachedMode} - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-dependency-classes-install - pre-site - - resolve - collect - copy-dependencies - unpack-dependencies - - - false - true - true - ${project.build.outputDirectory}/classes/ - pom,maven-plugin - antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby - weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete - - - - unpack-dependency-classes-deploy - pre-site - - resolve - collect - copy-dependencies - unpack-dependencies - - - false - true - true - ${project.build.outputDirectory}/classes/ - pom,maven-plugin - antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby - weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api - - - - unpack-dependencies-classpath - site - - analyze-only - analyze-dep-mgt - analyze-report - sources - resolve - resolve-plugins - collect - copy-dependencies - unpack-dependencies - build-classpath - - - true - true - ${project.build.outputDirectory}/classpath.txt - false - true - pom - org.webjars,antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby - weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api - - org.apache.maven.plugins:maven-surefire-plugin - - - org.apache.maven.plugins:maven-surefire-plugin - - - org.apache.maven.plugins:maven-surefire-plugin - - - - - check-dependencies-1 - site - - list - list-repositories - properties - - - - check-dependencies-2 - site - - analyze - analyze-dep-mgt - analyze-duplicate - analyze-report - - - - check-dependencies-3 - site - - tree - - - - report - site - - org.webjars - org.webjars,org.jclouds,org.jboss.as,xml-resolver,commons-configuration,org.codehaus.plexus,commons-digester,junit,log4j,io.openliberty.features,antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby - weld-probe-core,commons-configuration,jdk.tools,maven-antrun-plugin,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api - false - - - - analyze-report - - - - - - - get-dependency-sources - site - - sources - resolve - resolve-plugins - collect - copy-dependencies - unpack-dependencies - - - sources - pom,maven-plugin - org.webjars,antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby - weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api - false - ${project.build.directory}/dependency-sources/ - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java.version} - ${java.version} - ${project.build.sourceEncoding} - - -Xlint:all,-options,-path - - true - true - - - org.projectlombok - lombok - ${lombok.version} - - - - - - compile-classes - compile - - compile - testCompile - - - - - - 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-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 - - ${skipTests} - - default - ${skipTests} - - - - - org.apache.maven.plugins - maven-surefire-report-plugin - - - org.apache.maven.plugins - maven-failsafe-plugin - - ${skipTests} - - default - ${skipTests} - - - - - org.asciidoctor - asciidoctor-maven-plugin - - - org.liquibase - liquibase-maven-plugin - - - org.apache.maven.plugins - maven-project-info-reports-plugin - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - com.github.spotbugs - spotbugs-maven-plugin - - - org.apache.maven.plugins - maven-pmd-plugin - - - - + + ${project.artifactId} + clean package spring-boot:run + + + + org.apache.maven.plugins + maven-enforcer-plugin + ${maven-enforcer-plugin.version} + + + org.apache.maven.plugins + maven-invoker-plugin + ${maven-invoker-plugin.version} + + + com.dkanejs.maven.plugins + docker-compose-maven-plugin + ${docker-compose-maven-plugin.version} + + + org.apache.maven.plugins + maven-clean-plugin + ${maven-clean-plugin.version} + + + org.apache.maven.plugins + maven-dependency-plugin + ${maven-dependency-plugin.version} + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot-maven-plugin.version} + + + org.apache.maven.plugins + maven-install-plugin + ${maven-install-plugin.version} + + + org.apache.maven.plugins + maven-project-info-reports-plugin + ${maven-project-info-reports-plugin.version} + + + org.apache.maven.plugins + maven-jxr-plugin + ${maven-jxr-plugin.version} + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${maven-checkstyle-plugin.version} + + + com.github.spotbugs + spotbugs-maven-plugin + ${spotbugs-maven-plugin.version} + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + org.apache.maven.plugins + maven-surefire-report-plugin + ${maven-surefire-report-plugin.version} + + + org.apache.maven.plugins + maven-release-plugin + ${maven-release-plugin.version} + + + org.asciidoctor + asciidoctor-maven-plugin + ${asciidoctor-maven-plugin.version} + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + + org.apache.maven.plugins + maven-pmd-plugin + ${maven-pmd-plugin.version} + + + net.sourceforge.pmd + pmd-core + ${pmdVersion} + compile + + + net.sourceforge.pmd + pmd-java + ${pmdVersion} + compile + + + net.sourceforge.pmd + pmd-javascript + ${pmdVersion} + compile + + + net.sourceforge.pmd + pmd-jsp + ${pmdVersion} + compile + + + + + org.apache.maven.plugins + maven-source-plugin + ${maven-source-plugin.version} + + + org.apache.maven.plugins + maven-site-plugin + ${maven-site-plugin.version} + + + + org.apache.maven.plugins + maven-deploy-plugin + ${maven-deploy-plugin.version} + + + org.apache.maven.plugins + maven-failsafe-plugin + ${maven-failsafe-plugin.version} + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-versions + + enforce + + + + + ERROR + + org.apache.maven.plugins:maven-verifier-plugin + + + Please consider using the maven-invoker-plugin + (http://maven.apache.org/plugins/maven-invoker-plugin/)! + + + + ${version.maven} + + + ${java.version} + + + + ${project.basedir}/README.md + ${project.basedir}/LICENSE + ${project.basedir}/src/main/docker/docker-compose.yml + ${project.basedir}/app.json + ${project.basedir}/_config.yml + ${project.basedir}/Procfile + ${project.basedir}/src/site/markdown/ABOUT.md + ${project.basedir}/src/site/markdown/CHANGELOG.md + ${project.basedir}/src/site/markdown/CLOUD_DEPLOYMENT.md + ${project.basedir}/src/site/markdown/DEVELOPMENT.md + ${project.basedir}/src/site/markdown/HOWTO.md + ${project.basedir}/src/site/markdown/MAVEN_PLUGINS.md + ${project.basedir}/src/site/markdown/REQUIREMENTS_FUNCTIONAL.md + ${project.basedir}/src/site/markdown/REQUIREMENTS_NONFUNCTIONAL.md + ${project.basedir}/src/site/markdown/TODO.md + ${project.basedir}/src/site/site.xml + ${project.basedir}/etc/build.sh + ${project.basedir}/etc/run.sh + ${project.basedir}/src/main/bash/psql.sh + ${project.basedir}/etc/docker-start.sh + ${project.basedir}/etc/docker-stop.sh + ${project.basedir}/src/main/sql/db-createdb-and-user-linux.sql + ${project.basedir}/src/main/sql/db-createdb-and-user-win10.sql + + + + + + + + + org.apache.maven.plugins + maven-invoker-plugin + + + integration-test + + install + run + + + src/it/settings.xml + ${project.build.directory}/it + ${project.build.directory}/it-repo + verify + + + + + + org.springframework.boot + spring-boot-maven-plugin + + true + true + + + org.springframework.boot + spring-boot-configuration-processor + + + + + + unpack-dependency-classes-install + install + + repackage + + + + id-build-info + process-resources + + build-info + + + + ${project.build.sourceEncoding} + ${project.reporting.outputEncoding} + ${maven.compiler.source} + ${maven.compiler.target} + + + + + + + com.dkanejs.maven.plugins + docker-compose-maven-plugin + + ${project.basedir}/src/main/docker/docker-compose.yml + ${docker-compose-maven-plugin.verbose} + ${docker-compose-maven-plugin.removeImages} + ${docker-compose-maven-plugin.removeVolumes} + ${docker-compose-maven-plugin.ignorePullFailures} + ${docker-compose-maven-plugin.detachedMode} + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-dependency-classes-install + pre-site + + resolve + collect + copy-dependencies + unpack-dependencies + + + false + true + true + ${project.build.outputDirectory}/classes/ + pom,maven-plugin + antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby + + weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete + + + + + unpack-dependency-classes-deploy + pre-site + + resolve + collect + copy-dependencies + unpack-dependencies + + + false + true + true + ${project.build.outputDirectory}/classes/ + pom,maven-plugin + antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby + + weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api + + + + + unpack-dependencies-classpath + site + + analyze-only + analyze-dep-mgt + analyze-report + sources + resolve + resolve-plugins + collect + copy-dependencies + unpack-dependencies + build-classpath + + + true + true + ${project.build.outputDirectory}/classpath.txt + false + true + pom + org.webjars,antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby + + weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api + + + org.apache.maven.plugins:maven-surefire-plugin + + + org.apache.maven.plugins:maven-surefire-plugin + + + + org.apache.maven.plugins:maven-surefire-plugin + + + + + + check-dependencies-1 + site + + list + list-repositories + properties + + + + check-dependencies-2 + site + + analyze + analyze-dep-mgt + analyze-duplicate + analyze-report + + + + check-dependencies-3 + site + + tree + + + + report + site + + org.webjars + + org.webjars,org.jclouds,org.jboss.as,xml-resolver,commons-configuration,org.codehaus.plexus,commons-digester,junit,log4j,io.openliberty.features,antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby + + + weld-probe-core,commons-configuration,jdk.tools,maven-antrun-plugin,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api + + false + + + + analyze-report + + + + + + + get-dependency-sources + site + + sources + resolve + resolve-plugins + collect + copy-dependencies + unpack-dependencies + + + sources + pom,maven-plugin + org.webjars,antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby + + weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api + + false + ${project.build.directory}/dependency-sources/ + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java.version} + ${java.version} + ${project.build.sourceEncoding} + + -Xlint:all,-options,-path + + true + true + + + org.projectlombok + lombok + ${lombok.version} + + + + + + compile-classes + compile + + compile + testCompile + + + + + + 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-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 + + ${skipTests} + + default + ${skipTests} + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + + + org.apache.maven.plugins + maven-failsafe-plugin + + ${skipTests} + + default + ${skipTests} + + + + + org.asciidoctor + asciidoctor-maven-plugin + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + com.github.spotbugs + spotbugs-maven-plugin + + + org.apache.maven.plugins + maven-pmd-plugin + + + - - - - org.apache.maven.plugins - maven-enforcer-plugin - true - - - org.apache.maven.plugins - maven-invoker-plugin - true - - - org.springframework.boot - spring-boot-maven-plugin - true - - true - - - org.springframework.boot - spring-boot-configuration-processor - - - - - - com.dkanejs.maven.plugins - docker-compose-maven-plugin - true - - ${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 - true - - - org.apache.maven.plugins - maven-compiler-plugin - 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-source-plugin - - - org.apache.maven.plugins - maven-site-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - ${skipTests} - - **/*Tests.java - **/*Test.java - - - **/Abstract*.java - - - default - ${skipTests} - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - ${skipTests} - - default - ${skipTests} - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - - true - true - - - - 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 - maven-surefire-report-plugin - - ${skipTests} - ${skipTests} - - - - org.asciidoctor - asciidoctor-maven-plugin - - - org.liquibase - liquibase-maven-plugin - - - + + + + org.apache.maven.plugins + maven-enforcer-plugin + true + + + org.apache.maven.plugins + maven-invoker-plugin + true + + + org.springframework.boot + spring-boot-maven-plugin + true + + true + + + org.springframework.boot + spring-boot-configuration-processor + + + + + + com.dkanejs.maven.plugins + docker-compose-maven-plugin + true + + ${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 + true + + + org.apache.maven.plugins + maven-compiler-plugin + 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-source-plugin + + + org.apache.maven.plugins + maven-site-plugin + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + true + true + + + + 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 + maven-surefire-plugin + + ${skipTests} + + **/*Tests.java + **/*Test.java + + + **/Abstract*.java + + + default + ${skipTests} + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + ${skipTests} + + default + ${skipTests} + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + + ${skipTests} + ${skipTests} + + + + org.asciidoctor + asciidoctor-maven-plugin + + + diff --git a/src/main/java/org/woehlke/simpleworklist/SimpleworklistApplication.java b/src/main/java/org/woehlke/java/simpleworklist/SimpleworklistApplication.java similarity index 72% rename from src/main/java/org/woehlke/simpleworklist/SimpleworklistApplication.java rename to src/main/java/org/woehlke/java/simpleworklist/SimpleworklistApplication.java index 81eaafd5..6c81558e 100644 --- a/src/main/java/org/woehlke/simpleworklist/SimpleworklistApplication.java +++ b/src/main/java/org/woehlke/java/simpleworklist/SimpleworklistApplication.java @@ -1,12 +1,12 @@ -package org.woehlke.simpleworklist; +package org.woehlke.java.simpleworklist; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.woehlke.simpleworklist.config.SimpleworklistProperties; -import org.woehlke.simpleworklist.config.WebMvcConfig; -import org.woehlke.simpleworklist.config.WebSecurityConfig; +import org.woehlke.java.simpleworklist.config.SimpleworklistProperties; +import org.woehlke.java.simpleworklist.config.WebMvcConfig; +import org.woehlke.java.simpleworklist.config.WebSecurityConfig; @ImportAutoConfiguration({ diff --git a/src/main/java/org/woehlke/simpleworklist/application/error/ApplicationErrorController.java b/src/main/java/org/woehlke/java/simpleworklist/application/error/ApplicationErrorController.java similarity index 98% rename from src/main/java/org/woehlke/simpleworklist/application/error/ApplicationErrorController.java rename to src/main/java/org/woehlke/java/simpleworklist/application/error/ApplicationErrorController.java index 7ec228e6..aa112e63 100644 --- a/src/main/java/org/woehlke/simpleworklist/application/error/ApplicationErrorController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/application/error/ApplicationErrorController.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.application.error; +package org.woehlke.java.simpleworklist.application.error; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/org/woehlke/simpleworklist/application/framework/AbstractController.java b/src/main/java/org/woehlke/java/simpleworklist/application/framework/AbstractController.java similarity index 82% rename from src/main/java/org/woehlke/simpleworklist/application/framework/AbstractController.java rename to src/main/java/org/woehlke/java/simpleworklist/application/framework/AbstractController.java index f0049bd1..85a3b581 100644 --- a/src/main/java/org/woehlke/simpleworklist/application/framework/AbstractController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/application/framework/AbstractController.java @@ -1,27 +1,27 @@ -package org.woehlke.simpleworklist.application.framework; +package org.woehlke.java.simpleworklist.application.framework; import org.springframework.ui.Model; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.SessionAttributes; -import org.woehlke.simpleworklist.domain.breadcrumb.BreadcrumbService; -import org.woehlke.simpleworklist.config.SimpleworklistProperties; -import org.woehlke.simpleworklist.domain.context.Context; -import org.woehlke.simpleworklist.domain.project.Project; -import org.woehlke.simpleworklist.domain.task.TaskService; -import org.woehlke.simpleworklist.domain.taskworkflow.TaskState; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; -import org.woehlke.simpleworklist.domain.task.TaskEnergy; -import org.woehlke.simpleworklist.domain.task.TaskTime; -import org.woehlke.simpleworklist.domain.context.ContextService; -import org.woehlke.simpleworklist.domain.project.ProjectService; -import org.woehlke.simpleworklist.domain.chat.ChatMessageService; -import org.woehlke.simpleworklist.domain.user.account.UserAccountService; -import org.woehlke.simpleworklist.application.session.UserSessionBean; +import org.woehlke.java.simpleworklist.domain.session.UserSessionBean; +import org.woehlke.java.simpleworklist.domain.breadcrumb.BreadcrumbService; +import org.woehlke.java.simpleworklist.config.SimpleworklistProperties; +import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.project.Project; +import org.woehlke.java.simpleworklist.domain.task.TaskService; +import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.task.TaskEnergy; +import org.woehlke.java.simpleworklist.domain.task.TaskTime; +import org.woehlke.java.simpleworklist.domain.context.ContextService; +import org.woehlke.java.simpleworklist.domain.project.ProjectService; +import org.woehlke.java.simpleworklist.domain.chat.ChatMessageService; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccountService; import org.springframework.beans.factory.annotation.Autowired; -import org.woehlke.simpleworklist.domain.user.access.UserAuthorizationService; -import org.woehlke.simpleworklist.domain.user.login.UserAccountLoginSuccessService; +import org.woehlke.java.simpleworklist.domain.user.access.UserAuthorizationService; +import org.woehlke.java.simpleworklist.domain.user.login.UserAccountLoginSuccessService; import javax.validation.constraints.NotNull; import java.util.ArrayList; diff --git a/src/main/java/org/woehlke/simpleworklist/application/framework/AuditModel.java b/src/main/java/org/woehlke/java/simpleworklist/application/framework/AuditModel.java similarity index 96% rename from src/main/java/org/woehlke/simpleworklist/application/framework/AuditModel.java rename to src/main/java/org/woehlke/java/simpleworklist/application/framework/AuditModel.java index 258dc952..94693f8d 100644 --- a/src/main/java/org/woehlke/simpleworklist/application/framework/AuditModel.java +++ b/src/main/java/org/woehlke/java/simpleworklist/application/framework/AuditModel.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.application.framework; +package org.woehlke.java.simpleworklist.application.framework; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Getter; diff --git a/src/main/java/org/woehlke/simpleworklist/application/framework/ComparableById.java b/src/main/java/org/woehlke/java/simpleworklist/application/framework/ComparableById.java similarity index 60% rename from src/main/java/org/woehlke/simpleworklist/application/framework/ComparableById.java rename to src/main/java/org/woehlke/java/simpleworklist/application/framework/ComparableById.java index 9cb3d211..c0b1d3ca 100644 --- a/src/main/java/org/woehlke/simpleworklist/application/framework/ComparableById.java +++ b/src/main/java/org/woehlke/java/simpleworklist/application/framework/ComparableById.java @@ -1,6 +1,4 @@ -package org.woehlke.simpleworklist.application.framework; - -import org.woehlke.simpleworklist.application.framework.AuditModel; +package org.woehlke.java.simpleworklist.application.framework; public interface ComparableById { boolean equalsById(T otherObject); diff --git a/src/main/java/org/woehlke/simpleworklist/application/listener/ApplicationContextRefreshedListener.java b/src/main/java/org/woehlke/java/simpleworklist/application/listener/ApplicationContextRefreshedListener.java similarity index 91% rename from src/main/java/org/woehlke/simpleworklist/application/listener/ApplicationContextRefreshedListener.java rename to src/main/java/org/woehlke/java/simpleworklist/application/listener/ApplicationContextRefreshedListener.java index b59b98a9..23c2f4c3 100644 --- a/src/main/java/org/woehlke/simpleworklist/application/listener/ApplicationContextRefreshedListener.java +++ b/src/main/java/org/woehlke/java/simpleworklist/application/listener/ApplicationContextRefreshedListener.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.application.listener; +package org.woehlke.java.simpleworklist.application.listener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -6,7 +6,7 @@ import org.springframework.context.ApplicationListener; import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.stereotype.Component; -import org.woehlke.simpleworklist.domain.search.SearchService; +import org.woehlke.java.simpleworklist.domain.search.SearchService; /** diff --git a/src/main/java/org/woehlke/simpleworklist/application/listener/ApplicationContextStartedListener.java b/src/main/java/org/woehlke/java/simpleworklist/application/listener/ApplicationContextStartedListener.java similarity index 91% rename from src/main/java/org/woehlke/simpleworklist/application/listener/ApplicationContextStartedListener.java rename to src/main/java/org/woehlke/java/simpleworklist/application/listener/ApplicationContextStartedListener.java index f8d8e68f..6d8c0876 100644 --- a/src/main/java/org/woehlke/simpleworklist/application/listener/ApplicationContextStartedListener.java +++ b/src/main/java/org/woehlke/java/simpleworklist/application/listener/ApplicationContextStartedListener.java @@ -1,11 +1,11 @@ -package org.woehlke.simpleworklist.application.listener; +package org.woehlke.java.simpleworklist.application.listener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationListener; import org.springframework.context.event.ContextStartedEvent; import org.springframework.stereotype.Component; -import org.woehlke.simpleworklist.domain.search.SearchService; +import org.woehlke.java.simpleworklist.domain.search.SearchService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/woehlke/simpleworklist/config/SimpleworklistProperties.java b/src/main/java/org/woehlke/java/simpleworklist/config/SimpleworklistProperties.java similarity index 95% rename from src/main/java/org/woehlke/simpleworklist/config/SimpleworklistProperties.java rename to src/main/java/org/woehlke/java/simpleworklist/config/SimpleworklistProperties.java index 98f9dcfb..33ec5b5b 100644 --- a/src/main/java/org/woehlke/simpleworklist/config/SimpleworklistProperties.java +++ b/src/main/java/org/woehlke/java/simpleworklist/config/SimpleworklistProperties.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.config; +package org.woehlke.java.simpleworklist.config; import lombok.Getter; import lombok.Setter; @@ -13,7 +13,7 @@ @Component @Getter @Setter -@ConfigurationProperties(prefix="org.woehlke.simpleworklist") +@ConfigurationProperties(prefix="org.woehlke.java.simpleworklist") @Validated public class SimpleworklistProperties { diff --git a/src/main/java/org/woehlke/simpleworklist/config/WebMvcConfig.java b/src/main/java/org/woehlke/java/simpleworklist/config/WebMvcConfig.java similarity index 98% rename from src/main/java/org/woehlke/simpleworklist/config/WebMvcConfig.java rename to src/main/java/org/woehlke/java/simpleworklist/config/WebMvcConfig.java index 8e883565..65732f19 100644 --- a/src/main/java/org/woehlke/simpleworklist/config/WebMvcConfig.java +++ b/src/main/java/org/woehlke/java/simpleworklist/config/WebMvcConfig.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.config; +package org.woehlke.java.simpleworklist.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -29,7 +29,7 @@ @EnableWebMvc @EnableSpringDataWebSupport @EnableJpaRepositories({ - "org.woehlke.simpleworklist" + "org.woehlke.java.simpleworklist" }) @EnableConfigurationProperties({ SimpleworklistProperties.class diff --git a/src/main/java/org/woehlke/simpleworklist/config/WebSecurityConfig.java b/src/main/java/org/woehlke/java/simpleworklist/config/WebSecurityConfig.java similarity index 97% rename from src/main/java/org/woehlke/simpleworklist/config/WebSecurityConfig.java rename to src/main/java/org/woehlke/java/simpleworklist/config/WebSecurityConfig.java index 069795cb..980a881b 100644 --- a/src/main/java/org/woehlke/simpleworklist/config/WebSecurityConfig.java +++ b/src/main/java/org/woehlke/java/simpleworklist/config/WebSecurityConfig.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.config; +package org.woehlke.java.simpleworklist.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; @@ -20,7 +20,7 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.woehlke.simpleworklist.domain.user.access.ApplicationUserDetailsService; +import org.woehlke.java.simpleworklist.domain.user.access.ApplicationUserDetailsService; @Configuration diff --git a/src/main/java/org/woehlke/simpleworklist/domain/breadcrumb/Breadcrumb.java b/src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/Breadcrumb.java similarity index 92% rename from src/main/java/org/woehlke/simpleworklist/domain/breadcrumb/Breadcrumb.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/Breadcrumb.java index 78b4f182..c5cd7af6 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/breadcrumb/Breadcrumb.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/Breadcrumb.java @@ -1,11 +1,11 @@ -package org.woehlke.simpleworklist.domain.breadcrumb; +package org.woehlke.java.simpleworklist.domain.breadcrumb; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import org.woehlke.simpleworklist.domain.context.Context; -import org.woehlke.simpleworklist.domain.project.Project; -import org.woehlke.simpleworklist.domain.task.Task; +import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.project.Project; +import org.woehlke.java.simpleworklist.domain.task.Task; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/breadcrumb/BreadcrumbItem.java b/src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbItem.java similarity index 89% rename from src/main/java/org/woehlke/simpleworklist/domain/breadcrumb/BreadcrumbItem.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbItem.java index 2f9eb870..ca140204 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/breadcrumb/BreadcrumbItem.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbItem.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.breadcrumb; +package org.woehlke.java.simpleworklist.domain.breadcrumb; import lombok.*; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/breadcrumb/BreadcrumbService.java b/src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbService.java similarity index 81% rename from src/main/java/org/woehlke/simpleworklist/domain/breadcrumb/BreadcrumbService.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbService.java index 66fa18ec..3e7e79ab 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/breadcrumb/BreadcrumbService.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbService.java @@ -1,10 +1,10 @@ -package org.woehlke.simpleworklist.domain.breadcrumb; +package org.woehlke.java.simpleworklist.domain.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.taskworkflow.TaskState; -import org.woehlke.simpleworklist.application.session.UserSessionBean; +import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.project.Project; +import org.woehlke.java.simpleworklist.domain.task.Task; +import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState; +import org.woehlke.java.simpleworklist.domain.session.UserSessionBean; import java.util.Locale; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/breadcrumb/BreadcrumbServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbServiceImpl.java similarity index 96% rename from src/main/java/org/woehlke/simpleworklist/domain/breadcrumb/BreadcrumbServiceImpl.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbServiceImpl.java index 1b224ca6..a7bb1c5b 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/breadcrumb/BreadcrumbServiceImpl.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbServiceImpl.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.breadcrumb; +package org.woehlke.java.simpleworklist.domain.breadcrumb; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -6,12 +6,12 @@ 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.ContextService; -import org.woehlke.simpleworklist.domain.project.Project; -import org.woehlke.simpleworklist.domain.task.Task; -import org.woehlke.simpleworklist.domain.taskworkflow.TaskState; -import org.woehlke.simpleworklist.application.session.UserSessionBean; +import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.project.Project; +import org.woehlke.java.simpleworklist.domain.task.Task; +import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState; +import org.woehlke.java.simpleworklist.domain.context.ContextService; +import org.woehlke.java.simpleworklist.domain.session.UserSessionBean; import java.util.Locale; import java.util.Optional; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessage.java b/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessage.java similarity index 90% rename from src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessage.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessage.java index ab3e94d0..035519cf 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessage.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessage.java @@ -1,11 +1,11 @@ -package org.woehlke.simpleworklist.domain.chat; +package org.woehlke.java.simpleworklist.domain.chat; import lombok.*; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; //import org.hibernate.validator.constraints.SafeHtml; -import org.woehlke.simpleworklist.application.framework.AuditModel; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.application.framework.AuditModel; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; import javax.persistence.*; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageController.java similarity index 91% rename from src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageController.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageController.java index c1b4ba64..ccd06b9e 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageController.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.chat; +package org.woehlke.java.simpleworklist.domain.chat; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; @@ -13,11 +13,11 @@ 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.framework.AbstractController; -import org.woehlke.simpleworklist.domain.breadcrumb.Breadcrumb; -import org.woehlke.simpleworklist.application.session.UserSessionBean; -import org.woehlke.simpleworklist.domain.context.Context; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.application.framework.AbstractController; +import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb; +import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.session.UserSessionBean; import javax.validation.Valid; import java.util.Locale; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageForm.java b/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageForm.java similarity index 91% rename from src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageForm.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageForm.java index a21a95ac..cc81dbc8 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageForm.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageForm.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.chat; +package org.woehlke.java.simpleworklist.domain.chat; import lombok.*; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageRepository.java b/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageRepository.java similarity index 92% rename from src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageRepository.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageRepository.java index 40a87be6..910e562b 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageRepository.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageRepository.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.chat; +package org.woehlke.java.simpleworklist.domain.chat; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; import java.util.List; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageService.java b/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageService.java similarity index 80% rename from src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageService.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageService.java index bf999519..9e9dc83a 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageService.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageService.java @@ -1,8 +1,8 @@ -package org.woehlke.simpleworklist.domain.chat; +package org.woehlke.java.simpleworklist.domain.chat; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; /** * Created by tw on 16.02.2016. diff --git a/src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageServiceImpl.java similarity index 95% rename from src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageServiceImpl.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageServiceImpl.java index ddb99400..aae8a7c0 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageServiceImpl.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageServiceImpl.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.chat; +package org.woehlke.java.simpleworklist.domain.chat; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; @@ -6,7 +6,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/context/Context.java b/src/main/java/org/woehlke/java/simpleworklist/domain/context/Context.java similarity index 91% rename from src/main/java/org/woehlke/simpleworklist/domain/context/Context.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/context/Context.java index 646bc800..9ccdee00 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/context/Context.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/context/Context.java @@ -1,13 +1,13 @@ -package org.woehlke.simpleworklist.domain.context; +package org.woehlke.java.simpleworklist.domain.context; import lombok.*; import org.hibernate.annotations.LazyToOne; import org.hibernate.validator.constraints.Length; //import org.hibernate.validator.constraints.SafeHtml; -import org.woehlke.simpleworklist.application.framework.AuditModel; -import org.woehlke.simpleworklist.application.framework.ComparableById; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.application.framework.AuditModel; +import org.woehlke.java.simpleworklist.application.framework.ComparableById; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; import javax.persistence.*; import javax.persistence.Index; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/context/ContextController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/context/ContextController.java similarity index 87% rename from src/main/java/org/woehlke/simpleworklist/domain/context/ContextController.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/context/ContextController.java index f61e085e..c3dd16cb 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/context/ContextController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/context/ContextController.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.context; +package org.woehlke.java.simpleworklist.domain.context; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; @@ -7,8 +7,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.woehlke.simpleworklist.application.framework.AbstractController; -import org.woehlke.simpleworklist.application.session.UserSessionBean; +import org.woehlke.java.simpleworklist.application.framework.AbstractController; +import org.woehlke.java.simpleworklist.domain.session.UserSessionBean; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/context/ContextRepository.java b/src/main/java/org/woehlke/java/simpleworklist/domain/context/ContextRepository.java similarity index 81% rename from src/main/java/org/woehlke/simpleworklist/domain/context/ContextRepository.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/context/ContextRepository.java index 8197e83c..83736d17 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/context/ContextRepository.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/context/ContextRepository.java @@ -1,10 +1,10 @@ -package org.woehlke.simpleworklist.domain.context; +package org.woehlke.java.simpleworklist.domain.context; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; import java.util.List; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/context/ContextService.java b/src/main/java/org/woehlke/java/simpleworklist/domain/context/ContextService.java similarity index 76% rename from src/main/java/org/woehlke/simpleworklist/domain/context/ContextService.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/context/ContextService.java index 1ac36f31..1ea0c7ce 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/context/ContextService.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/context/ContextService.java @@ -1,7 +1,7 @@ -package org.woehlke.simpleworklist.domain.context; +package org.woehlke.java.simpleworklist.domain.context; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; -import org.woehlke.simpleworklist.application.session.UserSessionBean; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.session.UserSessionBean; import java.util.List; import java.util.Optional; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/context/ContextServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/context/ContextServiceImpl.java similarity index 90% rename from src/main/java/org/woehlke/simpleworklist/domain/context/ContextServiceImpl.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/context/ContextServiceImpl.java index 4c65c108..7b4a5fb2 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/context/ContextServiceImpl.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/context/ContextServiceImpl.java @@ -1,15 +1,15 @@ -package org.woehlke.simpleworklist.domain.context; +package org.woehlke.java.simpleworklist.domain.context; 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.user.account.UserAccount; -import org.woehlke.simpleworklist.domain.project.ProjectRepository; -import org.woehlke.simpleworklist.domain.task.TaskRepository; +import org.woehlke.java.simpleworklist.domain.task.TaskRepository; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.project.ProjectRepository; import org.springframework.beans.factory.annotation.Autowired; -import org.woehlke.simpleworklist.application.session.UserSessionBean; +import org.woehlke.java.simpleworklist.domain.session.UserSessionBean; import java.util.List; import java.util.Optional; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/context/NewContextForm.java b/src/main/java/org/woehlke/java/simpleworklist/domain/context/NewContextForm.java similarity index 92% rename from src/main/java/org/woehlke/simpleworklist/domain/context/NewContextForm.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/context/NewContextForm.java index 8be1273a..75818973 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/context/NewContextForm.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/context/NewContextForm.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.context; +package org.woehlke.java.simpleworklist.domain.context; import lombok.*; import org.hibernate.validator.constraints.Length; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/language/Language.java b/src/main/java/org/woehlke/java/simpleworklist/domain/language/Language.java similarity index 92% rename from src/main/java/org/woehlke/simpleworklist/domain/language/Language.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/language/Language.java index cbaf5f0e..5f1824aa 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/language/Language.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/language/Language.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.language; +package org.woehlke.java.simpleworklist.domain.language; import javax.persistence.Enumerated; import java.io.Serializable; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/language/UserChangeLanguageForm.java b/src/main/java/org/woehlke/java/simpleworklist/domain/language/UserChangeLanguageForm.java similarity index 87% rename from src/main/java/org/woehlke/simpleworklist/domain/language/UserChangeLanguageForm.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/language/UserChangeLanguageForm.java index b3975856..66b5f756 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/language/UserChangeLanguageForm.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/language/UserChangeLanguageForm.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.language; +package org.woehlke.java.simpleworklist.domain.language; import lombok.*; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/project/Project.java b/src/main/java/org/woehlke/java/simpleworklist/domain/project/Project.java similarity index 93% rename from src/main/java/org/woehlke/simpleworklist/domain/project/Project.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/project/Project.java index 97441255..f421f7f2 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/project/Project.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/project/Project.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.project; +package org.woehlke.java.simpleworklist.domain.project; import java.io.Serializable; import java.util.ArrayList; @@ -17,10 +17,10 @@ import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; //import org.hibernate.validator.constraints.SafeHtml; -import org.woehlke.simpleworklist.domain.context.Context; -import org.woehlke.simpleworklist.application.framework.AuditModel; -import org.woehlke.simpleworklist.application.framework.ComparableById; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.application.framework.AuditModel; +import org.woehlke.java.simpleworklist.application.framework.ComparableById; @Entity @Table( diff --git a/src/main/java/org/woehlke/simpleworklist/domain/project/ProjectControllerService.java b/src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectControllerService.java similarity index 78% rename from src/main/java/org/woehlke/simpleworklist/domain/project/ProjectControllerService.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectControllerService.java index 6590290d..3d4162f9 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/project/ProjectControllerService.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectControllerService.java @@ -1,12 +1,11 @@ -package org.woehlke.simpleworklist.domain.project; +package org.woehlke.java.simpleworklist.domain.project; import org.springframework.ui.Model; import org.springframework.validation.BindingResult; -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.application.session.UserSessionBean; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.task.Task; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.session.UserSessionBean; import java.util.Locale; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/project/ProjectControllerServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectControllerServiceImpl.java similarity index 91% rename from src/main/java/org/woehlke/simpleworklist/domain/project/ProjectControllerServiceImpl.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectControllerServiceImpl.java index 760ed55a..fe30fa2f 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/project/ProjectControllerServiceImpl.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectControllerServiceImpl.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.project; +package org.woehlke.java.simpleworklist.domain.project; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -7,23 +7,18 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.ui.Model; import org.springframework.validation.BindingResult; -import org.woehlke.simpleworklist.domain.breadcrumb.Breadcrumb; -import org.woehlke.simpleworklist.domain.breadcrumb.BreadcrumbService; -import org.woehlke.simpleworklist.domain.context.Context; -import org.woehlke.simpleworklist.domain.project.Project; -import org.woehlke.simpleworklist.domain.project.ProjectControllerService; -import org.woehlke.simpleworklist.domain.project.ProjectService; -import org.woehlke.simpleworklist.domain.task.Task; -import org.woehlke.simpleworklist.domain.task.TaskService; -import org.woehlke.simpleworklist.application.session.UserSessionBean; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb; +import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.task.Task; +import org.woehlke.java.simpleworklist.domain.task.TaskService; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.breadcrumb.BreadcrumbService; +import org.woehlke.java.simpleworklist.domain.session.UserSessionBean; import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; import java.util.Locale; -import static org.woehlke.simpleworklist.domain.project.Project.rootProjectId; - @Slf4j @Service public class ProjectControllerServiceImpl implements ProjectControllerService { @@ -113,14 +108,14 @@ public void addNewProjectToProjectRootForm( log.info("addNewProjectToRoot"); Project project; project = new Project(); - project.setId(rootProjectId); + project.setId(Project.rootProjectId); project.setContext(context); Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShowRootProject(locale,userSession); model.addAttribute("breadcrumb", breadcrumb); model.addAttribute("project", project); model.addAttribute("thisProjectId", project.getId()); model.addAttribute("breadcrumb", breadcrumb); - userSession.setLastProjectId(rootProjectId); + userSession.setLastProjectId(Project.rootProjectId); model.addAttribute("userSession", userSession); } diff --git a/src/main/java/org/woehlke/simpleworklist/domain/project/ProjectIdController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectIdController.java similarity index 97% rename from src/main/java/org/woehlke/simpleworklist/domain/project/ProjectIdController.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectIdController.java index 519772a3..b988629b 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/project/ProjectIdController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectIdController.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.project; +package org.woehlke.java.simpleworklist.domain.project; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; @@ -11,25 +11,24 @@ import org.springframework.validation.FieldError; import org.springframework.validation.ObjectError; import org.springframework.web.bind.annotation.*; -import org.woehlke.simpleworklist.application.framework.AbstractController; -import org.woehlke.simpleworklist.domain.context.Context; -import org.woehlke.simpleworklist.domain.task.Task; -import org.woehlke.simpleworklist.domain.task.TaskEnergy; -import org.woehlke.simpleworklist.domain.taskworkflow.TaskState; -import org.woehlke.simpleworklist.domain.task.TaskTime; -import org.woehlke.simpleworklist.domain.taskworkflow.TransformTaskIntoProjektService; -import org.woehlke.simpleworklist.domain.task.TaskService; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; -import org.woehlke.simpleworklist.domain.breadcrumb.Breadcrumb; -import org.woehlke.simpleworklist.application.session.UserSessionBean; +import org.woehlke.java.simpleworklist.application.framework.AbstractController; +import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb; +import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.task.Task; +import org.woehlke.java.simpleworklist.domain.task.TaskEnergy; +import org.woehlke.java.simpleworklist.domain.task.TaskService; +import org.woehlke.java.simpleworklist.domain.task.TaskTime; +import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState; +import org.woehlke.java.simpleworklist.domain.taskworkflow.TransformTaskIntoProjektService; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.session.UserSessionBean; import org.springframework.beans.factory.annotation.Autowired; + import javax.validation.Valid; import java.util.List; import java.util.Locale; -import static org.woehlke.simpleworklist.domain.project.Project.rootProjectId; - /** * Created by tw on 14.02.16. */ @@ -451,7 +450,7 @@ public final String editTaskPost( Task persistentTask = taskService.findOne(task.getId()); persistentTask.merge(task); task = taskService.updatedViaProject(persistentTask); - userSession.setLastProjectId(rootProjectId); + userSession.setLastProjectId(Project.rootProjectId); userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); diff --git a/src/main/java/org/woehlke/simpleworklist/domain/project/ProjectRepository.java b/src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectRepository.java similarity index 83% rename from src/main/java/org/woehlke/simpleworklist/domain/project/ProjectRepository.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectRepository.java index a7adf2d9..74e58423 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/project/ProjectRepository.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectRepository.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.project; +package org.woehlke.java.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.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.context.Context; @Repository public interface ProjectRepository extends JpaRepository { diff --git a/src/main/java/org/woehlke/simpleworklist/domain/project/ProjectRootController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectRootController.java similarity index 92% rename from src/main/java/org/woehlke/simpleworklist/domain/project/ProjectRootController.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectRootController.java index 5d6728ed..831f270c 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/project/ProjectRootController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectRootController.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.project; +package org.woehlke.java.simpleworklist.domain.project; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -12,25 +12,23 @@ import org.springframework.validation.FieldError; import org.springframework.validation.ObjectError; import org.springframework.web.bind.annotation.*; -import org.woehlke.simpleworklist.domain.breadcrumb.Breadcrumb; -import org.woehlke.simpleworklist.application.framework.AbstractController; -import org.woehlke.simpleworklist.domain.context.Context; -import org.woehlke.simpleworklist.domain.task.Task; -import org.woehlke.simpleworklist.domain.task.TaskEnergy; -import org.woehlke.simpleworklist.domain.taskworkflow.TaskState; -import org.woehlke.simpleworklist.domain.task.TaskTime; -import org.woehlke.simpleworklist.domain.taskworkflow.TransformTaskIntoProjektService; -import org.woehlke.simpleworklist.domain.task.TaskService; -import org.woehlke.simpleworklist.application.session.UserSessionBean; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb; +import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.task.Task; +import org.woehlke.java.simpleworklist.domain.task.TaskEnergy; +import org.woehlke.java.simpleworklist.domain.task.TaskService; +import org.woehlke.java.simpleworklist.domain.task.TaskTime; +import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState; +import org.woehlke.java.simpleworklist.domain.taskworkflow.TransformTaskIntoProjektService; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.application.framework.AbstractController; +import org.woehlke.java.simpleworklist.domain.session.UserSessionBean; import javax.validation.Valid; import java.util.List; import java.util.Locale; import java.util.UUID; -import static org.woehlke.simpleworklist.domain.project.Project.rootProjectId; - @Slf4j @Controller @RequestMapping(path = "/project/root") @@ -257,7 +255,7 @@ public final String editTaskPost( Task persistentTask = taskService.findOne(task.getId()); persistentTask.merge(task); task = taskService.updatedViaProjectRoot(persistentTask); - userSession.setLastProjectId(rootProjectId); + userSession.setLastProjectId(Project.rootProjectId); userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); @@ -279,7 +277,7 @@ public String changeTaskOrderId( log.info("destination Task: "+destinationTask.toString()); log.info("---------------------------------------------"); projectControllerService.moveTaskToTaskAndChangeTaskOrderInProjectRoot(sourceTask, destinationTask); - userSession.setLastProjectId(rootProjectId); + userSession.setLastProjectId(Project.rootProjectId); userSession.setLastTaskState(sourceTask.getTaskState()); userSession.setLastTaskId(sourceTask.getId()); model.addAttribute("userSession", userSession); @@ -293,7 +291,7 @@ public final String moveTaskToProjectRoot( Model model ) { task = taskService.moveTaskToRootProject(task); - userSession.setLastProjectId(rootProjectId); + userSession.setLastProjectId(Project.rootProjectId); userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); @@ -324,7 +322,7 @@ public final String moveTaskToInbox( log.info("dragged and dropped "+task.getId()+" to inbox"); task.moveToInbox(); taskService.updatedViaProjectRoot(task); - userSession.setLastProjectId(rootProjectId); + userSession.setLastProjectId(Project.rootProjectId); userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); @@ -340,7 +338,7 @@ public final String moveTaskToToday( log.info("dragged and dropped "+task.getId()+" to today"); task.moveToToday(); taskService.updatedViaProjectRoot(task); - userSession.setLastProjectId(rootProjectId); + userSession.setLastProjectId(Project.rootProjectId); userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); @@ -356,7 +354,7 @@ public final String moveTaskToNext( log.info("dragged and dropped "+task.getId()+" to next"); task.moveToNext(); taskService.updatedViaProjectRoot(task); - userSession.setLastProjectId(rootProjectId); + userSession.setLastProjectId(Project.rootProjectId); userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); @@ -372,7 +370,7 @@ public final String moveTaskToWaiting( log.info("dragged and dropped "+task.getId()+" to waiting"); task.moveToWaiting(); taskService.updatedViaProjectRoot(task); - userSession.setLastProjectId(rootProjectId); + userSession.setLastProjectId(Project.rootProjectId); userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); @@ -388,7 +386,7 @@ public final String moveTaskToSomeday( log.info("dragged and dropped "+task.getId()+" to someday"); task.moveToSomeday(); taskService.updatedViaProjectRoot(task); - userSession.setLastProjectId(rootProjectId); + userSession.setLastProjectId(Project.rootProjectId); userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); @@ -404,7 +402,7 @@ public final String moveTaskToFocus( log.info("dragged and dropped "+task.getId()+" to focus"); task.moveToFocus(); taskService.updatedViaProjectRoot(task); - userSession.setLastProjectId(rootProjectId); + userSession.setLastProjectId(Project.rootProjectId); userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); @@ -420,7 +418,7 @@ public final String moveTaskToCompleted( log.info("dragged and dropped "+task.getId()+" to completed"); task.moveToCompletedTasks(); taskService.updatedViaProjectRoot(task); - userSession.setLastProjectId(rootProjectId); + userSession.setLastProjectId(Project.rootProjectId); userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); @@ -436,7 +434,7 @@ public final String moveTaskToTrash( log.info("dragged and dropped "+task.getId()+" to trash"); task.moveToTrash(); taskService.updatedViaProjectRoot(task); - userSession.setLastProjectId(rootProjectId); + userSession.setLastProjectId(Project.rootProjectId); userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); @@ -451,7 +449,7 @@ public final String moveAllCompletedToTrash( Context context = super.getContext(userSession); taskService.moveAllCompletedToTrash(context); userSession.setLastContextId(context.getId()); - userSession.setLastProjectId(rootProjectId); + userSession.setLastProjectId(Project.rootProjectId); model.addAttribute("userSession", userSession); return rootProjectUrl; } @@ -464,7 +462,7 @@ public final String emptyTrash( Context context = super.getContext(userSession); taskService.emptyTrash(context); userSession.setLastContextId(context.getId()); - userSession.setLastProjectId(rootProjectId); + userSession.setLastProjectId(Project.rootProjectId); model.addAttribute("userSession", userSession); return rootProjectUrl; } @@ -480,7 +478,7 @@ public final String deleteTaskGet( task.delete(); taskService.updatedViaProjectRoot(task); } - userSession.setLastProjectId(rootProjectId); + userSession.setLastProjectId(Project.rootProjectId); userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); @@ -496,7 +494,7 @@ public final String undeleteTaskGet( log.info("undeleteTaskGet"); task.undelete(); taskService.updatedViaProjectRoot(task); - userSession.setLastProjectId(rootProjectId); + userSession.setLastProjectId(Project.rootProjectId); userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); @@ -510,7 +508,7 @@ public final String transformTaskIntoProjectGet( Model model ) { log.info("transformTaskIntoProjectGet"); - userSession.setLastProjectId(rootProjectId); + userSession.setLastProjectId(Project.rootProjectId); userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); return transformTaskIntoProjektService.transformTaskIntoProjectGet(task, userSession, model); @@ -526,7 +524,7 @@ public final String setDoneTaskGet( //long maxOrderIdTaskState = taskService.getMaxOrderIdTaskState(TaskState.COMPLETED,task.getContext()); //task.setOrderIdTaskState(++maxOrderIdTaskState); task = taskService.updatedViaProjectRoot(task); - userSession.setLastProjectId(rootProjectId); + userSession.setLastProjectId(Project.rootProjectId); userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); @@ -543,7 +541,7 @@ public final String unsetDoneTaskGet( //long maxOrderIdTaskState = taskService.getMaxOrderIdTaskState(task.getTaskState(),task.getContext()); //task.setOrderIdTaskState(++maxOrderIdTaskState); task = taskService.updatedViaProjectRoot(task); - userSession.setLastProjectId(rootProjectId); + userSession.setLastProjectId(Project.rootProjectId); userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); @@ -558,7 +556,7 @@ public final String setFocusGet( ){ task.setFocus(); task = taskService.updatedViaProjectRoot(task); - userSession.setLastProjectId(rootProjectId); + userSession.setLastProjectId(Project.rootProjectId); userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); @@ -573,7 +571,7 @@ public final String unsetFocusGet( ){ task.unsetFocus(); task = taskService.updatedViaProjectRoot(task); - userSession.setLastProjectId(rootProjectId); + userSession.setLastProjectId(Project.rootProjectId); userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); diff --git a/src/main/java/org/woehlke/simpleworklist/domain/project/ProjectService.java b/src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectService.java similarity index 82% rename from src/main/java/org/woehlke/simpleworklist/domain/project/ProjectService.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectService.java index 6ded1847..49879432 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/project/ProjectService.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectService.java @@ -1,11 +1,10 @@ -package org.woehlke.simpleworklist.domain.project; +package org.woehlke.java.simpleworklist.domain.project; import java.util.List; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import org.woehlke.simpleworklist.domain.context.Context; -import org.woehlke.simpleworklist.domain.project.Project; +import org.woehlke.java.simpleworklist.domain.context.Context; public interface ProjectService { diff --git a/src/main/java/org/woehlke/simpleworklist/domain/project/ProjectServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectServiceImpl.java similarity index 96% rename from src/main/java/org/woehlke/simpleworklist/domain/project/ProjectServiceImpl.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectServiceImpl.java index 68cad1e0..c345143f 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/project/ProjectServiceImpl.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectServiceImpl.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.project; +package org.woehlke.java.simpleworklist.domain.project; import java.util.ArrayList; import java.util.List; @@ -12,9 +12,9 @@ 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.task.Task; -import org.woehlke.simpleworklist.domain.task.TaskRepository; +import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.task.Task; +import org.woehlke.java.simpleworklist.domain.task.TaskRepository; import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/search/SearchController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/search/SearchController.java similarity index 80% rename from src/main/java/org/woehlke/simpleworklist/domain/search/SearchController.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/search/SearchController.java index d22ab0dd..3a1bf6af 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/search/SearchController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/search/SearchController.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.search; +package org.woehlke.java.simpleworklist.domain.search; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; @@ -7,11 +7,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; -import org.woehlke.simpleworklist.application.framework.AbstractController; -import org.woehlke.simpleworklist.domain.breadcrumb.Breadcrumb; -import org.woehlke.simpleworklist.domain.search.result.SearchResult; -import org.woehlke.simpleworklist.application.session.UserSessionBean; -import org.woehlke.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.application.framework.AbstractController; +import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.search.result.SearchResult; +import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb; +import org.woehlke.java.simpleworklist.domain.session.UserSessionBean; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/search/SearchService.java b/src/main/java/org/woehlke/java/simpleworklist/domain/search/SearchService.java new file mode 100644 index 00000000..36d32492 --- /dev/null +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/search/SearchService.java @@ -0,0 +1,18 @@ +package org.woehlke.java.simpleworklist.domain.search; + +import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.search.request.SearchRequest; +import org.woehlke.java.simpleworklist.domain.search.result.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/domain/search/SearchServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/search/SearchServiceImpl.java similarity index 79% rename from src/main/java/org/woehlke/simpleworklist/domain/search/SearchServiceImpl.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/search/SearchServiceImpl.java index 42927749..a11effef 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/search/SearchServiceImpl.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/search/SearchServiceImpl.java @@ -1,15 +1,14 @@ -package org.woehlke.simpleworklist.domain.search; +package org.woehlke.java.simpleworklist.domain.search; 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.search.SearchService; -import org.woehlke.simpleworklist.domain.search.request.SearchRequest; -import org.woehlke.simpleworklist.domain.search.request.SearchRequestService; -import org.woehlke.simpleworklist.domain.search.result.SearchResult; -import org.woehlke.simpleworklist.domain.search.result.SearchResultService; +import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.search.request.SearchRequest; +import org.woehlke.java.simpleworklist.domain.search.request.SearchRequestService; +import org.woehlke.java.simpleworklist.domain.search.result.SearchResult; +import org.woehlke.java.simpleworklist.domain.search.result.SearchResultService; /** diff --git a/src/main/java/org/woehlke/simpleworklist/domain/search/request/SearchRequest.java b/src/main/java/org/woehlke/java/simpleworklist/domain/search/request/SearchRequest.java similarity index 88% rename from src/main/java/org/woehlke/simpleworklist/domain/search/request/SearchRequest.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/search/request/SearchRequest.java index cc349027..a1bdd27f 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/search/request/SearchRequest.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/search/request/SearchRequest.java @@ -1,11 +1,11 @@ -package org.woehlke.simpleworklist.domain.search.request; +package org.woehlke.java.simpleworklist.domain.search.request; import lombok.*; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; -import org.woehlke.simpleworklist.application.framework.AuditModel; -import org.woehlke.simpleworklist.application.framework.ComparableById; -import org.woehlke.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.application.framework.AuditModel; +import org.woehlke.java.simpleworklist.application.framework.ComparableById; +import org.woehlke.java.simpleworklist.domain.context.Context; import javax.persistence.*; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/search/request/SearchRequestRepository.java b/src/main/java/org/woehlke/java/simpleworklist/domain/search/request/SearchRequestRepository.java similarity index 77% rename from src/main/java/org/woehlke/simpleworklist/domain/search/request/SearchRequestRepository.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/search/request/SearchRequestRepository.java index 7148e1ca..1e22e4d0 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/search/request/SearchRequestRepository.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/search/request/SearchRequestRepository.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.search.request; +package org.woehlke.java.simpleworklist.domain.search.request; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/search/request/SearchRequestService.java b/src/main/java/org/woehlke/java/simpleworklist/domain/search/request/SearchRequestService.java similarity index 70% rename from src/main/java/org/woehlke/simpleworklist/domain/search/request/SearchRequestService.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/search/request/SearchRequestService.java index 7927c74d..c7c0f647 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/search/request/SearchRequestService.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/search/request/SearchRequestService.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.search.request; +package org.woehlke.java.simpleworklist.domain.search.request; public interface SearchRequestService { diff --git a/src/main/java/org/woehlke/simpleworklist/domain/search/request/SearchRequestServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/search/request/SearchRequestServiceImpl.java similarity index 94% rename from src/main/java/org/woehlke/simpleworklist/domain/search/request/SearchRequestServiceImpl.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/search/request/SearchRequestServiceImpl.java index e2f917df..24c3f044 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/search/request/SearchRequestServiceImpl.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/search/request/SearchRequestServiceImpl.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.search.request; +package org.woehlke.java.simpleworklist.domain.search.request; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/search/result/SearchResult.java b/src/main/java/org/woehlke/java/simpleworklist/domain/search/result/SearchResult.java similarity index 86% rename from src/main/java/org/woehlke/simpleworklist/domain/search/result/SearchResult.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/search/result/SearchResult.java index 550b6466..c07a7077 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/search/result/SearchResult.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/search/result/SearchResult.java @@ -1,13 +1,13 @@ -package org.woehlke.simpleworklist.domain.search.result; +package org.woehlke.java.simpleworklist.domain.search.result; import lombok.*; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; -import org.woehlke.simpleworklist.application.framework.AuditModel; -import org.woehlke.simpleworklist.application.framework.ComparableById; -import org.woehlke.simpleworklist.domain.search.request.SearchRequest; -import org.woehlke.simpleworklist.domain.task.Task; -import org.woehlke.simpleworklist.domain.project.Project; +import org.woehlke.java.simpleworklist.application.framework.AuditModel; +import org.woehlke.java.simpleworklist.application.framework.ComparableById; +import org.woehlke.java.simpleworklist.domain.project.Project; +import org.woehlke.java.simpleworklist.domain.search.request.SearchRequest; +import org.woehlke.java.simpleworklist.domain.task.Task; import javax.persistence.*; import java.io.Serializable; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/search/result/SearchResultRepository.java b/src/main/java/org/woehlke/java/simpleworklist/domain/search/result/SearchResultRepository.java similarity index 62% rename from src/main/java/org/woehlke/simpleworklist/domain/search/result/SearchResultRepository.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/search/result/SearchResultRepository.java index 7114d1d7..d500c85e 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/search/result/SearchResultRepository.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/search/result/SearchResultRepository.java @@ -1,8 +1,7 @@ -package org.woehlke.simpleworklist.domain.search.result; +package org.woehlke.java.simpleworklist.domain.search.result; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import org.woehlke.simpleworklist.domain.search.result.SearchResult; @Repository public interface SearchResultRepository extends JpaRepository { diff --git a/src/main/java/org/woehlke/simpleworklist/domain/search/result/SearchResultService.java b/src/main/java/org/woehlke/java/simpleworklist/domain/search/result/SearchResultService.java similarity index 57% rename from src/main/java/org/woehlke/simpleworklist/domain/search/result/SearchResultService.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/search/result/SearchResultService.java index 5480f8e5..67237e5e 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/search/result/SearchResultService.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/search/result/SearchResultService.java @@ -1,6 +1,4 @@ -package org.woehlke.simpleworklist.domain.search.result; - -import org.woehlke.simpleworklist.domain.search.result.SearchResult; +package org.woehlke.java.simpleworklist.domain.search.result; public interface SearchResultService { diff --git a/src/main/java/org/woehlke/simpleworklist/domain/search/result/SearchResultServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/search/result/SearchResultServiceImpl.java similarity index 82% rename from src/main/java/org/woehlke/simpleworklist/domain/search/result/SearchResultServiceImpl.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/search/result/SearchResultServiceImpl.java index d1ca5017..ad490f10 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/search/result/SearchResultServiceImpl.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/search/result/SearchResultServiceImpl.java @@ -1,13 +1,10 @@ -package org.woehlke.simpleworklist.domain.search.result; +package org.woehlke.java.simpleworklist.domain.search.result; 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.result.SearchResult; -import org.woehlke.simpleworklist.domain.search.result.SearchResultRepository; -import org.woehlke.simpleworklist.domain.search.result.SearchResultService; import java.util.UUID; diff --git a/src/main/java/org/woehlke/simpleworklist/application/session/UserSessionBean.java b/src/main/java/org/woehlke/java/simpleworklist/domain/session/UserSessionBean.java similarity index 89% rename from src/main/java/org/woehlke/simpleworklist/application/session/UserSessionBean.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/session/UserSessionBean.java index 621a0668..a7f2e557 100644 --- a/src/main/java/org/woehlke/simpleworklist/application/session/UserSessionBean.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/session/UserSessionBean.java @@ -1,10 +1,10 @@ -package org.woehlke.simpleworklist.application.session; +package org.woehlke.java.simpleworklist.domain.session; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import org.woehlke.simpleworklist.domain.taskworkflow.TaskState; +import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState; import java.io.Serializable; @@ -23,7 +23,7 @@ public class UserSessionBean implements Serializable { private Long lastContextId; private Long lastProjectId; private Long lastTaskId; - private TaskState lastTaskState; + private TaskState lastTaskState; //TODO: make it to String? private String lastSearchterm; //TODO: Make SearchRequest to Entity public UserSessionBean(){ diff --git a/src/main/java/org/woehlke/simpleworklist/domain/task/Task.java b/src/main/java/org/woehlke/java/simpleworklist/domain/task/Task.java similarity index 96% rename from src/main/java/org/woehlke/simpleworklist/domain/task/Task.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/task/Task.java index 91fbeb9d..79d28cb5 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/task/Task.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/task/Task.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.task; +package org.woehlke.java.simpleworklist.domain.task; import java.io.Serializable; import java.util.Date; @@ -30,12 +30,12 @@ //import org.hibernate.validator.constraints.SafeHtml; //import org.springframework.data.jpa.repository.Temporal; import org.springframework.format.annotation.DateTimeFormat; -import org.woehlke.simpleworklist.domain.context.Context; -import org.woehlke.simpleworklist.domain.project.Project; -import org.woehlke.simpleworklist.domain.taskworkflow.TaskState; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; -import org.woehlke.simpleworklist.application.framework.AuditModel; -import org.woehlke.simpleworklist.application.framework.ComparableById; +import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.project.Project; +import org.woehlke.java.simpleworklist.application.framework.AuditModel; +import org.woehlke.java.simpleworklist.application.framework.ComparableById; import static javax.persistence.TemporalType.*; import static org.hibernate.annotations.LazyToOneOption.PROXY; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/task/TaskEnergy.java b/src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskEnergy.java similarity index 93% rename from src/main/java/org/woehlke/simpleworklist/domain/task/TaskEnergy.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskEnergy.java index 3b02a729..4bbebff3 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/task/TaskEnergy.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskEnergy.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.task; +package org.woehlke.java.simpleworklist.domain.task; import javax.persistence.Enumerated; import java.io.Serializable; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/task/TaskRepository.java b/src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskRepository.java similarity index 95% rename from src/main/java/org/woehlke/simpleworklist/domain/task/TaskRepository.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskRepository.java index edc5209e..b326469a 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/task/TaskRepository.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskRepository.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.task; +package org.woehlke.java.simpleworklist.domain.task; import java.util.List; @@ -8,9 +8,9 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import org.woehlke.simpleworklist.domain.context.Context; -import org.woehlke.simpleworklist.domain.project.Project; -import org.woehlke.simpleworklist.domain.taskworkflow.TaskState; +import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState; +import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.project.Project; @Repository public interface TaskRepository extends JpaRepository { diff --git a/src/main/java/org/woehlke/simpleworklist/domain/task/TaskService.java b/src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskService.java similarity index 91% rename from src/main/java/org/woehlke/simpleworklist/domain/task/TaskService.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskService.java index 2b5c4808..f88275d0 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/task/TaskService.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskService.java @@ -1,10 +1,10 @@ -package org.woehlke.simpleworklist.domain.task; +package org.woehlke.java.simpleworklist.domain.task; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import org.woehlke.simpleworklist.domain.context.Context; -import org.woehlke.simpleworklist.domain.project.Project; -import org.woehlke.simpleworklist.domain.taskworkflow.TaskState; +import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.project.Project; +import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState; public interface TaskService { diff --git a/src/main/java/org/woehlke/simpleworklist/domain/task/TaskServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskServiceImpl.java similarity index 98% rename from src/main/java/org/woehlke/simpleworklist/domain/task/TaskServiceImpl.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskServiceImpl.java index a887b489..7bec7fa6 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/task/TaskServiceImpl.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskServiceImpl.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.task; +package org.woehlke.java.simpleworklist.domain.task; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -7,9 +7,9 @@ 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.project.Project; -import org.woehlke.simpleworklist.domain.taskworkflow.TaskState; +import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.project.Project; +import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState; import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; @@ -221,6 +221,11 @@ public void emptyTrash(@NotNull Context context) { taskListChanged.add(task); } taskRepository.saveAll(taskListChanged); + List taskListDeleted = taskRepository.findByTaskStateAndContext( + TaskState.DELETED, + context + ); + taskRepository.deleteAll(taskListDeleted); } @Override diff --git a/src/main/java/org/woehlke/simpleworklist/domain/task/TaskTime.java b/src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskTime.java similarity index 94% rename from src/main/java/org/woehlke/simpleworklist/domain/task/TaskTime.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskTime.java index cc92ab5a..e3c9a098 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/task/TaskTime.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskTime.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.task; +package org.woehlke.java.simpleworklist.domain.task; import javax.persistence.Enumerated; import java.io.Serializable; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/taskworkflow/MoveTaskToTaskInTaskstateService.java b/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/MoveTaskToTaskInTaskstateService.java similarity index 61% rename from src/main/java/org/woehlke/simpleworklist/domain/taskworkflow/MoveTaskToTaskInTaskstateService.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/MoveTaskToTaskInTaskstateService.java index 76d2cbef..453bef8a 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/taskworkflow/MoveTaskToTaskInTaskstateService.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/MoveTaskToTaskInTaskstateService.java @@ -1,11 +1,10 @@ -package org.woehlke.simpleworklist.domain.taskworkflow; +package org.woehlke.java.simpleworklist.domain.taskworkflow; import org.springframework.data.domain.Pageable; import org.springframework.ui.Model; -import org.woehlke.simpleworklist.domain.context.Context; -import org.woehlke.simpleworklist.domain.task.Task; -import org.woehlke.simpleworklist.domain.taskworkflow.TaskState; -import org.woehlke.simpleworklist.application.session.UserSessionBean; +import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.task.Task; +import org.woehlke.java.simpleworklist.domain.session.UserSessionBean; import java.util.Locale; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/taskworkflow/MoveTaskToTaskInTaskstateServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/MoveTaskToTaskInTaskstateServiceImpl.java similarity index 86% rename from src/main/java/org/woehlke/simpleworklist/domain/taskworkflow/MoveTaskToTaskInTaskstateServiceImpl.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/MoveTaskToTaskInTaskstateServiceImpl.java index d8e8cda0..b36a8c83 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/taskworkflow/MoveTaskToTaskInTaskstateServiceImpl.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/MoveTaskToTaskInTaskstateServiceImpl.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.taskworkflow; +package org.woehlke.java.simpleworklist.domain.taskworkflow; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -8,14 +8,12 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import org.springframework.ui.Model; -import org.woehlke.simpleworklist.domain.breadcrumb.Breadcrumb; -import org.woehlke.simpleworklist.domain.breadcrumb.BreadcrumbService; -import org.woehlke.simpleworklist.domain.context.Context; -import org.woehlke.simpleworklist.domain.task.Task; -import org.woehlke.simpleworklist.domain.task.TaskService; -import org.woehlke.simpleworklist.domain.taskworkflow.MoveTaskToTaskInTaskstateService; -import org.woehlke.simpleworklist.domain.taskworkflow.TaskState; -import org.woehlke.simpleworklist.application.session.UserSessionBean; +import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb; +import org.woehlke.java.simpleworklist.domain.breadcrumb.BreadcrumbService; +import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.task.Task; +import org.woehlke.java.simpleworklist.domain.task.TaskService; +import org.woehlke.java.simpleworklist.domain.session.UserSessionBean; import javax.validation.constraints.NotNull; import java.util.Locale; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/taskworkflow/TaskState.java b/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskState.java similarity index 95% rename from src/main/java/org/woehlke/simpleworklist/domain/taskworkflow/TaskState.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskState.java index 5acb6dc7..b8f5731f 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/taskworkflow/TaskState.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskState.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.taskworkflow; +package org.woehlke.java.simpleworklist.domain.taskworkflow; import java.io.Serializable; import java.util.Arrays; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/taskworkflow/TaskStateTabController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskStateTabController.java similarity index 95% rename from src/main/java/org/woehlke/simpleworklist/domain/taskworkflow/TaskStateTabController.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskStateTabController.java index 0176d152..9067ab9b 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/taskworkflow/TaskStateTabController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskStateTabController.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.taskworkflow; +package org.woehlke.java.simpleworklist.domain.taskworkflow; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; @@ -9,9 +9,9 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.woehlke.simpleworklist.application.framework.AbstractController; -import org.woehlke.simpleworklist.domain.context.Context; -import org.woehlke.simpleworklist.application.session.UserSessionBean; +import org.woehlke.java.simpleworklist.application.framework.AbstractController; +import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.session.UserSessionBean; import lombok.extern.slf4j.Slf4j; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/taskworkflow/TaskStateTaskController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskStateTaskController.java similarity index 96% rename from src/main/java/org/woehlke/simpleworklist/domain/taskworkflow/TaskStateTaskController.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskStateTaskController.java index f78fadd7..2600a29d 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/taskworkflow/TaskStateTaskController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskStateTaskController.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.taskworkflow; +package org.woehlke.java.simpleworklist.domain.taskworkflow; import org.springframework.stereotype.Controller; @@ -7,20 +7,21 @@ import org.springframework.validation.FieldError; import org.springframework.validation.ObjectError; import org.springframework.web.bind.annotation.*; -import org.woehlke.simpleworklist.domain.breadcrumb.Breadcrumb; -import org.woehlke.simpleworklist.application.framework.AbstractController; -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.TaskService; -import org.woehlke.simpleworklist.domain.task.TaskTime; -import org.woehlke.simpleworklist.application.session.UserSessionBean; +import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb; +import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.project.Project; +import org.woehlke.java.simpleworklist.domain.task.Task; +import org.woehlke.java.simpleworklist.domain.task.TaskEnergy; +import org.woehlke.java.simpleworklist.domain.task.TaskService; +import org.woehlke.java.simpleworklist.domain.task.TaskTime; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.application.framework.AbstractController; +import org.woehlke.java.simpleworklist.domain.session.UserSessionBean; import org.springframework.beans.factory.annotation.Autowired; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; import lombok.extern.slf4j.Slf4j; + import javax.validation.Valid; import javax.validation.constraints.NotNull; import java.util.List; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/taskworkflow/TransformTaskIntoProjektService.java b/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TransformTaskIntoProjektService.java similarity index 51% rename from src/main/java/org/woehlke/simpleworklist/domain/taskworkflow/TransformTaskIntoProjektService.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TransformTaskIntoProjektService.java index 98ecc01d..2384eda1 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/taskworkflow/TransformTaskIntoProjektService.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TransformTaskIntoProjektService.java @@ -1,8 +1,8 @@ -package org.woehlke.simpleworklist.domain.taskworkflow; +package org.woehlke.java.simpleworklist.domain.taskworkflow; import org.springframework.ui.Model; -import org.woehlke.simpleworklist.domain.task.Task; -import org.woehlke.simpleworklist.application.session.UserSessionBean; +import org.woehlke.java.simpleworklist.domain.task.Task; +import org.woehlke.java.simpleworklist.domain.session.UserSessionBean; public interface TransformTaskIntoProjektService { diff --git a/src/main/java/org/woehlke/simpleworklist/domain/taskworkflow/TransformTaskIntoProjektServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TransformTaskIntoProjektServiceImpl.java similarity index 75% rename from src/main/java/org/woehlke/simpleworklist/domain/taskworkflow/TransformTaskIntoProjektServiceImpl.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TransformTaskIntoProjektServiceImpl.java index 5f4b17ec..0413300e 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/taskworkflow/TransformTaskIntoProjektServiceImpl.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TransformTaskIntoProjektServiceImpl.java @@ -1,16 +1,15 @@ -package org.woehlke.simpleworklist.domain.taskworkflow; +package org.woehlke.java.simpleworklist.domain.taskworkflow; 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.domain.project.Project; -import org.woehlke.simpleworklist.domain.project.ProjectService; -import org.woehlke.simpleworklist.application.session.UserSessionBean; -import org.woehlke.simpleworklist.domain.task.Task; -import org.woehlke.simpleworklist.domain.task.TaskService; -import org.woehlke.simpleworklist.domain.taskworkflow.TransformTaskIntoProjektService; +import org.woehlke.java.simpleworklist.domain.project.Project; +import org.woehlke.java.simpleworklist.domain.task.Task; +import org.woehlke.java.simpleworklist.domain.task.TaskService; +import org.woehlke.java.simpleworklist.domain.project.ProjectService; +import org.woehlke.java.simpleworklist.domain.session.UserSessionBean; import javax.validation.constraints.NotNull; @@ -29,7 +28,7 @@ public TransformTaskIntoProjektServiceImpl(ProjectService projectService, TaskSe @Override public String transformTaskIntoProjectGet( - @NotNull Task task, @NotNull UserSessionBean userSession, @NotNull Model model + @NotNull Task task, @NotNull UserSessionBean userSession, @NotNull Model model ) { log.info("transformTaskIntoProjectGet"); Project thisProject = new Project(); diff --git a/src/main/java/org/woehlke/simpleworklist/domain/testdata/TestDataController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/testdata/TestDataController.java similarity index 83% rename from src/main/java/org/woehlke/simpleworklist/domain/testdata/TestDataController.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/testdata/TestDataController.java index ad5a0e81..e83ab96a 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/testdata/TestDataController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/testdata/TestDataController.java @@ -1,13 +1,13 @@ -package org.woehlke.simpleworklist.domain.testdata; +package org.woehlke.java.simpleworklist.domain.testdata; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; import org.springframework.beans.factory.annotation.Autowired; -import org.woehlke.simpleworklist.domain.user.login.UserAccountLoginSuccessService; +import org.woehlke.java.simpleworklist.domain.user.login.UserAccountLoginSuccessService; @Slf4j @Controller diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/testdata/TestDataService.java b/src/main/java/org/woehlke/java/simpleworklist/domain/testdata/TestDataService.java new file mode 100644 index 00000000..11700b1f --- /dev/null +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/testdata/TestDataService.java @@ -0,0 +1,8 @@ +package org.woehlke.java.simpleworklist.domain.testdata; + +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; + +public interface TestDataService { + + void createTestData(UserAccount userAccount); +} diff --git a/src/main/java/org/woehlke/simpleworklist/domain/testdata/TestDataServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/testdata/TestDataServiceImpl.java similarity index 99% rename from src/main/java/org/woehlke/simpleworklist/domain/testdata/TestDataServiceImpl.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/testdata/TestDataServiceImpl.java index 3d113ca7..f375db43 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/testdata/TestDataServiceImpl.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/testdata/TestDataServiceImpl.java @@ -1,19 +1,19 @@ -package org.woehlke.simpleworklist.domain.testdata; +package org.woehlke.java.simpleworklist.domain.testdata; 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.project.Project; -import org.woehlke.simpleworklist.domain.task.Task; -import org.woehlke.simpleworklist.domain.task.TaskEnergy; -import org.woehlke.simpleworklist.domain.taskworkflow.TaskState; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; -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.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.project.Project; +import org.woehlke.java.simpleworklist.domain.task.Task; +import org.woehlke.java.simpleworklist.domain.task.TaskEnergy; +import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.task.TaskTime; +import org.woehlke.java.simpleworklist.domain.context.ContextRepository; +import org.woehlke.java.simpleworklist.domain.task.TaskRepository; +import org.woehlke.java.simpleworklist.domain.project.ProjectRepository; import org.springframework.beans.factory.annotation.Autowired; import java.util.Date; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/access/ApplicationUserDetailsService.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/access/ApplicationUserDetailsService.java similarity index 71% rename from src/main/java/org/woehlke/simpleworklist/domain/user/access/ApplicationUserDetailsService.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/access/ApplicationUserDetailsService.java index 0ef9b7c6..1ab3cae1 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/access/ApplicationUserDetailsService.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/access/ApplicationUserDetailsService.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.access; +package org.woehlke.java.simpleworklist.domain.user.access; import org.springframework.security.core.userdetails.UserDetailsService; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/access/ApplicationUserDetailsServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/access/ApplicationUserDetailsServiceImpl.java similarity index 84% rename from src/main/java/org/woehlke/simpleworklist/domain/user/access/ApplicationUserDetailsServiceImpl.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/access/ApplicationUserDetailsServiceImpl.java index b84a7e82..a94c3419 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/access/ApplicationUserDetailsServiceImpl.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/access/ApplicationUserDetailsServiceImpl.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.access; +package org.woehlke.java.simpleworklist.domain.user.access; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -7,8 +7,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; -import org.woehlke.simpleworklist.domain.user.account.UserAccountRepository; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccountRepository; @Slf4j @Service diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/user/access/UserAuthorizationService.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/access/UserAuthorizationService.java new file mode 100644 index 00000000..38262860 --- /dev/null +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/access/UserAuthorizationService.java @@ -0,0 +1,14 @@ +package org.woehlke.java.simpleworklist.domain.user.access; + +import org.woehlke.java.simpleworklist.domain.user.accountselfservice.UserChangePasswordForm; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.user.login.LoginForm; + +public interface UserAuthorizationService { + + void changeUsersPassword(UserChangePasswordForm userAccountFormBean, UserAccount user); + + boolean confirmUserByLoginAndPassword(String userEmail, String oldUserPassword); + + boolean authorize(LoginForm loginForm); +} diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/access/UserAuthorizationServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/access/UserAuthorizationServiceImpl.java similarity index 88% rename from src/main/java/org/woehlke/simpleworklist/domain/user/access/UserAuthorizationServiceImpl.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/access/UserAuthorizationServiceImpl.java index 0982a8c6..d08a8ac3 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/access/UserAuthorizationServiceImpl.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/access/UserAuthorizationServiceImpl.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.access; +package org.woehlke.java.simpleworklist.domain.user.access; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -10,10 +10,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import org.woehlke.simpleworklist.domain.user.login.LoginForm; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; -import org.woehlke.simpleworklist.domain.user.account.UserAccountRepository; -import org.woehlke.simpleworklist.domain.user.accountselfservice.UserChangePasswordForm; +import org.woehlke.java.simpleworklist.domain.user.accountselfservice.UserChangePasswordForm; +import org.woehlke.java.simpleworklist.domain.user.login.LoginForm; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccountRepository; @Slf4j @Service diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/access/UserDetailsDto.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/access/UserDetailsDto.java similarity index 92% rename from src/main/java/org/woehlke/simpleworklist/domain/user/access/UserDetailsDto.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/access/UserDetailsDto.java index a1366377..6e747282 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/access/UserDetailsDto.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/access/UserDetailsDto.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.access; +package org.woehlke.java.simpleworklist.domain.user.access; import java.util.ArrayList; import java.util.Collection; @@ -8,7 +8,7 @@ import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; @Getter diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/account/UserAccount.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccount.java similarity index 92% rename from src/main/java/org/woehlke/simpleworklist/domain/user/account/UserAccount.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccount.java index d8020df1..2a7d1b05 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/account/UserAccount.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccount.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.account; +package org.woehlke.java.simpleworklist.domain.user.account; import javax.validation.constraints.Email; @@ -7,10 +7,10 @@ import lombok.Setter; import lombok.ToString; //import org.hibernate.validator.constraints.SafeHtml; -import org.woehlke.simpleworklist.domain.context.Context; -import org.woehlke.simpleworklist.application.framework.AuditModel; -import org.woehlke.simpleworklist.application.framework.ComparableById; -import org.woehlke.simpleworklist.domain.language.Language; +import org.woehlke.java.simpleworklist.domain.language.Language; +import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.application.framework.AuditModel; +import org.woehlke.java.simpleworklist.application.framework.ComparableById; import java.io.Serializable; import java.util.Date; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/account/UserAccountForm.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccountForm.java similarity index 96% rename from src/main/java/org/woehlke/simpleworklist/domain/user/account/UserAccountForm.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccountForm.java index 73a1135a..63bb4d91 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/account/UserAccountForm.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccountForm.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.account; +package org.woehlke.java.simpleworklist.domain.user.account; import javax.persistence.Transient; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/account/UserAccountRepository.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccountRepository.java similarity index 85% rename from src/main/java/org/woehlke/simpleworklist/domain/user/account/UserAccountRepository.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccountRepository.java index 12b8e39f..642f8da8 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/account/UserAccountRepository.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccountRepository.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.account; +package org.woehlke.java.simpleworklist.domain.user.account; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/account/UserAccountService.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccountService.java similarity index 75% rename from src/main/java/org/woehlke/simpleworklist/domain/user/account/UserAccountService.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccountService.java index bdce820f..9abb30d0 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/account/UserAccountService.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccountService.java @@ -1,11 +1,9 @@ -package org.woehlke.simpleworklist.domain.user.account; +package org.woehlke.java.simpleworklist.domain.user.account; import java.util.Map; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; -import org.woehlke.simpleworklist.domain.user.account.UserAccountForm; public interface UserAccountService { diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/account/UserAccountServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccountServiceImpl.java similarity index 93% rename from src/main/java/org/woehlke/simpleworklist/domain/user/account/UserAccountServiceImpl.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccountServiceImpl.java index cbbe5b95..937e6944 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/account/UserAccountServiceImpl.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccountServiceImpl.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.account; +package org.woehlke.java.simpleworklist.domain.user.account; import java.util.*; @@ -13,10 +13,10 @@ 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.chat.ChatMessage; -import org.woehlke.simpleworklist.domain.context.ContextRepository; -import org.woehlke.simpleworklist.domain.chat.ChatMessageRepository; +import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.chat.ChatMessage; +import org.woehlke.java.simpleworklist.domain.context.ContextRepository; +import org.woehlke.java.simpleworklist.domain.chat.ChatMessageRepository; @Slf4j @Service("userAccountService") diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/account/UserRole.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/account/UserRole.java similarity index 79% rename from src/main/java/org/woehlke/simpleworklist/domain/user/account/UserRole.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/account/UserRole.java index 933e78eb..e327ed35 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/account/UserRole.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/account/UserRole.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.account; +package org.woehlke.java.simpleworklist.domain.user.account; import javax.persistence.Enumerated; import java.io.Serializable; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/accountpassword/UserAccountPassword.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/accountpassword/UserAccountPassword.java similarity index 86% rename from src/main/java/org/woehlke/simpleworklist/domain/user/accountpassword/UserAccountPassword.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/accountpassword/UserAccountPassword.java index bdd14bb9..b825bd3b 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/accountpassword/UserAccountPassword.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/accountpassword/UserAccountPassword.java @@ -1,10 +1,10 @@ -package org.woehlke.simpleworklist.domain.user.accountpassword; +package org.woehlke.java.simpleworklist.domain.user.accountpassword; import lombok.Getter; import lombok.Setter; -import org.woehlke.simpleworklist.application.framework.AuditModel; -import org.woehlke.simpleworklist.application.framework.ComparableById; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.application.framework.AuditModel; +import org.woehlke.java.simpleworklist.application.framework.ComparableById; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; import javax.persistence.*; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/accountpassword/UserAccountPasswordRepositories.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/accountpassword/UserAccountPasswordRepositories.java similarity index 76% rename from src/main/java/org/woehlke/simpleworklist/domain/user/accountpassword/UserAccountPasswordRepositories.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/accountpassword/UserAccountPasswordRepositories.java index ba25c34c..9b49ae9e 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/accountpassword/UserAccountPasswordRepositories.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/accountpassword/UserAccountPasswordRepositories.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.accountpassword; +package org.woehlke.java.simpleworklist.domain.user.accountpassword; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/accountpassword/UserAccountSecurityPasswordService.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/accountpassword/UserAccountSecurityPasswordService.java similarity index 71% rename from src/main/java/org/woehlke/simpleworklist/domain/user/accountpassword/UserAccountSecurityPasswordService.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/accountpassword/UserAccountSecurityPasswordService.java index c523d2b6..dce2b472 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/accountpassword/UserAccountSecurityPasswordService.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/accountpassword/UserAccountSecurityPasswordService.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.accountpassword; +package org.woehlke.java.simpleworklist.domain.user.accountpassword; import org.springframework.security.core.userdetails.UserDetailsPasswordService; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/accountpassword/UserAccountSecurityPasswordServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/accountpassword/UserAccountSecurityPasswordServiceImpl.java similarity index 87% rename from src/main/java/org/woehlke/simpleworklist/domain/user/accountpassword/UserAccountSecurityPasswordServiceImpl.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/accountpassword/UserAccountSecurityPasswordServiceImpl.java index a1fbeae3..1253c60c 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/accountpassword/UserAccountSecurityPasswordServiceImpl.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/accountpassword/UserAccountSecurityPasswordServiceImpl.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.accountpassword; +package org.woehlke.java.simpleworklist.domain.user.accountpassword; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -11,9 +11,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; -import org.woehlke.simpleworklist.domain.user.access.UserDetailsDto; -import org.woehlke.simpleworklist.domain.user.account.UserAccountRepository; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.user.access.UserDetailsDto; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccountRepository; @Slf4j @Service diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/accountselfservice/UserChangeDefaultContextForm.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/accountselfservice/UserChangeDefaultContextForm.java similarity index 76% rename from src/main/java/org/woehlke/simpleworklist/domain/user/accountselfservice/UserChangeDefaultContextForm.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/accountselfservice/UserChangeDefaultContextForm.java index cc898e45..f7cc9e88 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/accountselfservice/UserChangeDefaultContextForm.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/accountselfservice/UserChangeDefaultContextForm.java @@ -1,7 +1,7 @@ -package org.woehlke.simpleworklist.domain.user.accountselfservice; +package org.woehlke.java.simpleworklist.domain.user.accountselfservice; import lombok.*; -import org.woehlke.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.context.Context; import javax.validation.constraints.NotNull; import java.io.Serializable; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/accountselfservice/UserChangeNameForm.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/accountselfservice/UserChangeNameForm.java similarity index 90% rename from src/main/java/org/woehlke/simpleworklist/domain/user/accountselfservice/UserChangeNameForm.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/accountselfservice/UserChangeNameForm.java index 19a3d621..ee5396e1 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/accountselfservice/UserChangeNameForm.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/accountselfservice/UserChangeNameForm.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.accountselfservice; +package org.woehlke.java.simpleworklist.domain.user.accountselfservice; import javax.validation.constraints.NotBlank; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/accountselfservice/UserChangePasswordForm.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/accountselfservice/UserChangePasswordForm.java similarity index 94% rename from src/main/java/org/woehlke/simpleworklist/domain/user/accountselfservice/UserChangePasswordForm.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/accountselfservice/UserChangePasswordForm.java index c45583ff..169244cc 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/accountselfservice/UserChangePasswordForm.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/accountselfservice/UserChangePasswordForm.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.accountselfservice; +package org.woehlke.java.simpleworklist.domain.user.accountselfservice; import javax.validation.constraints.NotBlank; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/accountselfservice/UserSelfserviceController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/accountselfservice/UserSelfserviceController.java similarity index 96% rename from src/main/java/org/woehlke/simpleworklist/domain/user/accountselfservice/UserSelfserviceController.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/accountselfservice/UserSelfserviceController.java index 763d02cd..97112e6c 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/accountselfservice/UserSelfserviceController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/accountselfservice/UserSelfserviceController.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.accountselfservice; +package org.woehlke.java.simpleworklist.domain.user.accountselfservice; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -15,15 +15,15 @@ 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.domain.breadcrumb.Breadcrumb; -import org.woehlke.simpleworklist.application.framework.AbstractController; -import org.woehlke.simpleworklist.domain.context.NewContextForm; -import org.woehlke.simpleworklist.domain.language.UserChangeLanguageForm; -import org.woehlke.simpleworklist.domain.context.Context; -import org.woehlke.simpleworklist.domain.language.Language; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; -import org.woehlke.simpleworklist.domain.user.access.UserAuthorizationService; -import org.woehlke.simpleworklist.application.session.UserSessionBean; +import org.woehlke.java.simpleworklist.domain.language.Language; +import org.woehlke.java.simpleworklist.domain.language.UserChangeLanguageForm; +import org.woehlke.java.simpleworklist.domain.user.access.UserAuthorizationService; +import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb; +import org.woehlke.java.simpleworklist.application.framework.AbstractController; +import org.woehlke.java.simpleworklist.domain.context.NewContextForm; +import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.session.UserSessionBean; import javax.validation.Valid; import java.util.List; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/login/LoginForm.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/login/LoginForm.java similarity index 93% rename from src/main/java/org/woehlke/simpleworklist/domain/user/login/LoginForm.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/login/LoginForm.java index e9872867..d1785dd4 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/login/LoginForm.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/login/LoginForm.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.login; +package org.woehlke.java.simpleworklist.domain.user.login; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/login/LoginSuccessHandler.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/login/LoginSuccessHandler.java similarity index 91% rename from src/main/java/org/woehlke/simpleworklist/domain/user/login/LoginSuccessHandler.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/login/LoginSuccessHandler.java index b50107d6..39ebfd96 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/login/LoginSuccessHandler.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/login/LoginSuccessHandler.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.login; +package org.woehlke.java.simpleworklist.domain.user.login; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.Authentication; @@ -6,7 +6,8 @@ import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler; import org.springframework.stereotype.Component; import org.springframework.web.servlet.LocaleResolver; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.language.Language; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/login/UserAccountLoginSuccessService.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/login/UserAccountLoginSuccessService.java similarity index 69% rename from src/main/java/org/woehlke/simpleworklist/domain/user/login/UserAccountLoginSuccessService.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/login/UserAccountLoginSuccessService.java index 0e10d0be..c0fc1ac4 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/login/UserAccountLoginSuccessService.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/login/UserAccountLoginSuccessService.java @@ -1,7 +1,7 @@ -package org.woehlke.simpleworklist.domain.user.login; +package org.woehlke.java.simpleworklist.domain.user.login; import org.springframework.security.core.userdetails.UsernameNotFoundException; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; public interface UserAccountLoginSuccessService { diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/login/UserAccountLoginSuccessServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/login/UserAccountLoginSuccessServiceImpl.java similarity index 90% rename from src/main/java/org/woehlke/simpleworklist/domain/user/login/UserAccountLoginSuccessServiceImpl.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/login/UserAccountLoginSuccessServiceImpl.java index e85a69cd..a84dd056 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/login/UserAccountLoginSuccessServiceImpl.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/login/UserAccountLoginSuccessServiceImpl.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.login; +package org.woehlke.java.simpleworklist.domain.user.login; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -9,8 +9,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; -import org.woehlke.simpleworklist.domain.user.account.UserAccountRepository; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccountRepository; import java.util.Date; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/login/UserLoginController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/login/UserLoginController.java similarity index 94% rename from src/main/java/org/woehlke/simpleworklist/domain/user/login/UserLoginController.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/login/UserLoginController.java index cf5d505d..14e5b8ed 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/login/UserLoginController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/login/UserLoginController.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.login; +package org.woehlke.java.simpleworklist.domain.user.login; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -16,8 +16,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.support.SessionStatus; -import org.woehlke.simpleworklist.domain.user.access.UserAuthorizationService; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.user.access.UserAuthorizationService; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; @Slf4j @Controller diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecovery.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecovery.java similarity index 96% rename from src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecovery.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecovery.java index a85f2733..53939e83 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecovery.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecovery.java @@ -1,8 +1,8 @@ -package org.woehlke.simpleworklist.domain.user.passwordrecovery; +package org.woehlke.java.simpleworklist.domain.user.passwordrecovery; import javax.validation.constraints.Email; -import org.woehlke.simpleworklist.application.framework.AuditModel; +import org.woehlke.java.simpleworklist.application.framework.AuditModel; import javax.persistence.*; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryController.java similarity index 94% rename from src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryController.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryController.java index 06be0a98..f7b5ced1 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryController.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.passwordrecovery; +package org.woehlke.java.simpleworklist.domain.user.passwordrecovery; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; @@ -8,10 +8,10 @@ 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.domain.user.account.UserAccountForm; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; -import org.woehlke.simpleworklist.domain.user.signup.UserRegistrationForm; -import org.woehlke.simpleworklist.domain.user.account.UserAccountService; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccountService; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccountForm; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistrationForm; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryRepository.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryRepository.java similarity index 82% rename from src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryRepository.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryRepository.java index 68b91abb..f453022e 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryRepository.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryRepository.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.passwordrecovery; +package org.woehlke.java.simpleworklist.domain.user.passwordrecovery; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryService.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryService.java similarity index 87% rename from src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryService.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryService.java index 9e715f79..674f947a 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryService.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryService.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.passwordrecovery; +package org.woehlke.java.simpleworklist.domain.user.passwordrecovery; public interface UserPasswordRecoveryService { diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryServiceImpl.java similarity index 96% rename from src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryServiceImpl.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryServiceImpl.java index 52efa60b..fb536d5e 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryServiceImpl.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryServiceImpl.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.passwordrecovery; +package org.woehlke.java.simpleworklist.domain.user.passwordrecovery; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -9,8 +9,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import org.woehlke.simpleworklist.config.SimpleworklistProperties; -import org.woehlke.simpleworklist.domain.user.token.TokenGeneratorService; +import org.woehlke.java.simpleworklist.config.SimpleworklistProperties; +import org.woehlke.java.simpleworklist.domain.user.token.TokenGeneratorService; import java.util.Date; import java.util.UUID; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryStatus.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryStatus.java similarity index 85% rename from src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryStatus.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryStatus.java index a18feacd..a0c1bbbc 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryStatus.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryStatus.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.passwordrecovery; +package org.woehlke.java.simpleworklist.domain.user.passwordrecovery; import javax.persistence.Enumerated; import java.io.Serializable; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/signup/UserRegistration.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/signup/UserRegistration.java similarity index 96% rename from src/main/java/org/woehlke/simpleworklist/domain/user/signup/UserRegistration.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/signup/UserRegistration.java index 01c6d889..d9d8c365 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/signup/UserRegistration.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/signup/UserRegistration.java @@ -1,8 +1,8 @@ -package org.woehlke.simpleworklist.domain.user.signup; +package org.woehlke.java.simpleworklist.domain.user.signup; import javax.validation.constraints.Email; -import org.woehlke.simpleworklist.application.framework.AuditModel; +import org.woehlke.java.simpleworklist.application.framework.AuditModel; import javax.persistence.*; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/signup/UserRegistrationController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/signup/UserRegistrationController.java similarity index 96% rename from src/main/java/org/woehlke/simpleworklist/domain/user/signup/UserRegistrationController.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/signup/UserRegistrationController.java index 92a2265c..e288bac8 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/signup/UserRegistrationController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/signup/UserRegistrationController.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.signup; +package org.woehlke.java.simpleworklist.domain.user.signup; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -9,8 +9,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.woehlke.simpleworklist.domain.user.account.UserAccountForm; -import org.woehlke.simpleworklist.domain.user.account.UserAccountService; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccountService; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccountForm; import javax.validation.Valid; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/signup/UserRegistrationForm.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/signup/UserRegistrationForm.java similarity index 91% rename from src/main/java/org/woehlke/simpleworklist/domain/user/signup/UserRegistrationForm.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/signup/UserRegistrationForm.java index 4276c998..9cc4f739 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/signup/UserRegistrationForm.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/signup/UserRegistrationForm.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.signup; +package org.woehlke.java.simpleworklist.domain.user.signup; import lombok.*; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/signup/UserRegistrationRepository.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/signup/UserRegistrationRepository.java similarity index 84% rename from src/main/java/org/woehlke/simpleworklist/domain/user/signup/UserRegistrationRepository.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/signup/UserRegistrationRepository.java index 653a3ab5..4a3eae22 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/signup/UserRegistrationRepository.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/signup/UserRegistrationRepository.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.signup; +package org.woehlke.java.simpleworklist.domain.user.signup; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/signup/UserRegistrationService.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/signup/UserRegistrationService.java similarity index 88% rename from src/main/java/org/woehlke/simpleworklist/domain/user/signup/UserRegistrationService.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/signup/UserRegistrationService.java index 3ba8c702..44263dbb 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/signup/UserRegistrationService.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/signup/UserRegistrationService.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.signup; +package org.woehlke.java.simpleworklist.domain.user.signup; public interface UserRegistrationService { diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/signup/UserRegistrationServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/signup/UserRegistrationServiceImpl.java similarity index 96% rename from src/main/java/org/woehlke/simpleworklist/domain/user/signup/UserRegistrationServiceImpl.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/signup/UserRegistrationServiceImpl.java index dcb093d1..d393fa43 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/signup/UserRegistrationServiceImpl.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/signup/UserRegistrationServiceImpl.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.signup; +package org.woehlke.java.simpleworklist.domain.user.signup; import java.util.Date; import java.util.UUID; @@ -13,8 +13,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import org.woehlke.simpleworklist.config.SimpleworklistProperties; -import org.woehlke.simpleworklist.domain.user.token.TokenGeneratorService; +import org.woehlke.java.simpleworklist.config.SimpleworklistProperties; +import org.woehlke.java.simpleworklist.domain.user.token.TokenGeneratorService; @Slf4j @Service diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/signup/UserRegistrationStatus.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/signup/UserRegistrationStatus.java similarity index 86% rename from src/main/java/org/woehlke/simpleworklist/domain/user/signup/UserRegistrationStatus.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/signup/UserRegistrationStatus.java index 08e7d357..541d16f5 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/signup/UserRegistrationStatus.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/signup/UserRegistrationStatus.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.signup; +package org.woehlke.java.simpleworklist.domain.user.signup; import javax.persistence.Enumerated; import java.io.Serializable; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/token/TokenGeneratorService.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/token/TokenGeneratorService.java similarity index 53% rename from src/main/java/org/woehlke/simpleworklist/domain/user/token/TokenGeneratorService.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/token/TokenGeneratorService.java index aef63848..f865a7ac 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/token/TokenGeneratorService.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/token/TokenGeneratorService.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.token; +package org.woehlke.java.simpleworklist.domain.user.token; public interface TokenGeneratorService { diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/token/TokenGeneratorServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/token/TokenGeneratorServiceImpl.java similarity index 88% rename from src/main/java/org/woehlke/simpleworklist/domain/user/token/TokenGeneratorServiceImpl.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/user/token/TokenGeneratorServiceImpl.java index 87f45cdc..0773ac0d 100644 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/token/TokenGeneratorServiceImpl.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/token/TokenGeneratorServiceImpl.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.domain.user.token; +package org.woehlke.java.simpleworklist.domain.user.token; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/woehlke/simpleworklist/domain/search/SearchService.java b/src/main/java/org/woehlke/simpleworklist/domain/search/SearchService.java deleted file mode 100644 index 95eb22f8..00000000 --- a/src/main/java/org/woehlke/simpleworklist/domain/search/SearchService.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.woehlke.simpleworklist.domain.search; - -import org.woehlke.simpleworklist.domain.context.Context; -import org.woehlke.simpleworklist.domain.search.request.SearchRequest; -import org.woehlke.simpleworklist.domain.search.result.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/domain/testdata/TestDataService.java b/src/main/java/org/woehlke/simpleworklist/domain/testdata/TestDataService.java deleted file mode 100644 index 62352ad9..00000000 --- a/src/main/java/org/woehlke/simpleworklist/domain/testdata/TestDataService.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.woehlke.simpleworklist.domain.testdata; - -import org.woehlke.simpleworklist.domain.user.account.UserAccount; - -public interface TestDataService { - - void createTestData(UserAccount userAccount); -} diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/access/UserAuthorizationService.java b/src/main/java/org/woehlke/simpleworklist/domain/user/access/UserAuthorizationService.java deleted file mode 100644 index 062b9608..00000000 --- a/src/main/java/org/woehlke/simpleworklist/domain/user/access/UserAuthorizationService.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.woehlke.simpleworklist.domain.user.access; - -import org.woehlke.simpleworklist.domain.user.accountselfservice.UserChangePasswordForm; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; -import org.woehlke.simpleworklist.domain.user.login.LoginForm; - -public interface UserAuthorizationService { - - void changeUsersPassword(UserChangePasswordForm userAccountFormBean, UserAccount user); - - boolean confirmUserByLoginAndPassword(String userEmail, String oldUserPassword); - - boolean authorize(LoginForm loginForm); -} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index c9ad75a4..bfa8e9b1 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -62,58 +62,59 @@ spring: continue-on-error: true org: woehlke: - simpleworklist: - mail: - host: ${SIMPLEWORKLIST_MAIL_SMTP_HOST} - port: ${SIMPLEWORKLIST_MAIL_SMTP_PORT} - username: ${SIMPLEWORKLIST_MAIL_SMTP_USERNAME} - password: ${SIMPLEWORKLIST_MAIL_SMTP_PASSWORD} - auth: true - sslEnable: true - socketFactoryPort: 465 - socketFactoryClass: javax.net.ssl.SSLSocketFactory - registration: - maxRetries: 5 - ttlEmailVerificationRequest: 86400000 - urlHost: ${SIMPLEWORKLIST_URL_APP_HOST} - mailFrom: ${SIMPLEWORKLIST_MAIL_FROM} - webMvc: - controllerPageSize: 10 - staticResourceHandler: - - "/css" - - "/img" - - "/js" - dynamicResourceHandler: - - "/webjars" - webSecurity: - strengthBCryptPasswordEncoder: 10 - # iterations: ${SIMPLEWORKLIST_USER_ITERATIONS} - # hashWidth: ${SIMPLEWORKLIST_USER_HASH_WIDTH} - # secret: ${SIMPLEWORKLIST_USER_SECRET} - loginProcessingUrl: "/j_spring_security_check" - logoutUrl: "/user/logout" - cookieNamesToClear: - - "JSESSIONID" - invalidateHttpSession: true - defaultSuccessUrl: "/" - failureForwardUrl: "/user/login?login_error=1" - usernameParameter: "j_username" - passwordParameter: "j_password" - loginPage: "/user/login" - antPatternsPublic: - - "/webjars/**" - - "/css/**" - - "/img/**" - - "/js/**" - - "/favicon.ico" - - "/user/login*" - - "/user/register*" - - "/user/register/**" - - "/user/register/confirm/**" - - "/user/resetPassword*" - - "/user/resetPassword/**" - - "/user/resetPassword/confirm/**" - - "/error*" + java: + simpleworklist: + mail: + host: ${SIMPLEWORKLIST_MAIL_SMTP_HOST} + port: ${SIMPLEWORKLIST_MAIL_SMTP_PORT} + username: ${SIMPLEWORKLIST_MAIL_SMTP_USERNAME} + password: ${SIMPLEWORKLIST_MAIL_SMTP_PASSWORD} + auth: true + sslEnable: true + socketFactoryPort: 465 + socketFactoryClass: javax.net.ssl.SSLSocketFactory + registration: + maxRetries: 5 + ttlEmailVerificationRequest: 86400000 + urlHost: ${SIMPLEWORKLIST_URL_APP_HOST} + mailFrom: ${SIMPLEWORKLIST_MAIL_FROM} + webMvc: + controllerPageSize: 10 + staticResourceHandler: + - "/css" + - "/img" + - "/js" + dynamicResourceHandler: + - "/webjars" + webSecurity: + strengthBCryptPasswordEncoder: 10 + # iterations: ${SIMPLEWORKLIST_USER_ITERATIONS} + # hashWidth: ${SIMPLEWORKLIST_USER_HASH_WIDTH} + # secret: ${SIMPLEWORKLIST_USER_SECRET} + loginProcessingUrl: "/j_spring_security_check" + logoutUrl: "/user/logout" + cookieNamesToClear: + - "JSESSIONID" + invalidateHttpSession: true + defaultSuccessUrl: "/" + failureForwardUrl: "/user/login?login_error=1" + usernameParameter: "j_username" + passwordParameter: "j_password" + loginPage: "/user/login" + antPatternsPublic: + - "/webjars/**" + - "/css/**" + - "/img/**" + - "/js/**" + - "/favicon.ico" + - "/user/login*" + - "/user/register*" + - "/user/register/**" + - "/user/register/confirm/**" + - "/user/resetPassword*" + - "/user/resetPassword/**" + - "/user/resetPassword/confirm/**" + - "/error*" logging: level: root: INFO @@ -169,14 +170,15 @@ logging: ch: qos: WARN woehlke: - simpleworklist: - application: DEBUG - config: DEBUG - measurements: DEBUG - user: DEBUG - domain: DEBUG - services: DEBUG - common: INFO + java: + simpleworklist: + application: DEBUG + config: DEBUG + measurements: DEBUG + user: DEBUG + domain: DEBUG + services: DEBUG + common: INFO debug: false --- spring: @@ -210,12 +212,13 @@ logging: qos: WARN postgresql: WARN woehlke: - simpleworklist: - application: INFO - config: INFO - measurements: INFO - user: INFO - domain: INFO - services: INFO - common: INFO + java: + simpleworklist: + application: INFO + config: INFO + measurements: INFO + user: INFO + domain: INFO + services: INFO + common: INFO debug: false diff --git a/src/main/resources/liquibase.yml b/src/main/resources/liquibase.yml deleted file mode 100644 index 05400e0c..00000000 --- a/src/main/resources/liquibase.yml +++ /dev/null @@ -1,10 +0,0 @@ -changeLogFile: db/changelog/dbchangelog.xml -driver: org.postgresql.Driver -url: jdbc:postgresql://${SIMPLEWORKLIST_DS_HOST}:/${SIMPLEWORKLIST_DS_PORT}/${SIMPLEWORKLIST_DS_DB} -username: ${SIMPLEWORKLIST_DS_USR} -password: ${SIMPLEWORKLIST_DS_PWD} -referenceDriver: org.postgresql.Driver -referenceUrl: jdbc:postgresql://${SIMPLEWORKLIST_DSREF_HOST}:/${SIMPLEWORKLIST_DSREF_PORT}/${SIMPLEWORKLIST_DSREF_DB} -referenceUsername: ${SIMPLEWORKLIST_DSREF_USR} -referencePassword: ${SIMPLEWORKLIST_DSREF_PWD} -classpath: postgresql-42.2.10.jar diff --git a/src/main/resources/messages_de.properties b/src/main/resources/messages_de.properties index ce9557ac..cc26ce55 100644 --- a/src/main/resources/messages_de.properties +++ b/src/main/resources/messages_de.properties @@ -131,6 +131,7 @@ task.add.taskEnergy=Energie task.add.taskTime=Zeit task.add.button=Neue Aufgabe speichern layout.page.signedInUser=Angemeldet als +task.show.focus=Fokus task.show.title=Aufgabe task.show.dueDate=Fälligkeitsdatum task.show.text=Beschreibung @@ -256,6 +257,7 @@ task.col.twtooltip.badge.taskEnergy=Energie Aufwand task.col.twtooltip.badge.taskTime=Zeit Aufwand task.col.twtooltip.context=Kontext tasks.col.info.icons=  +tasks.col.focus=Fokus tasks.col.title=Title tasks.col.dueDate=Fälligkeitsdatum tasks.col.taskState=Status diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties index 101b4cec..a16c7130 100644 --- a/src/main/resources/messages_en.properties +++ b/src/main/resources/messages_en.properties @@ -130,6 +130,7 @@ task.add.taskEnergy=Energy task.add.taskTime=Time task.add.button=Add Task layout.page.signedInUser=Signed in as +task.show.focus=Focus task.show.title=Title task.show.dueDate=Due Date task.show.text=Description @@ -255,6 +256,7 @@ task.col.twtooltip.badge.taskEnergy=Energy Amount task.col.twtooltip.badge.taskTime=Time Amount task.col.twtooltip.context=Context tasks.col.info.icons=  +tasks.col.focus=Focus tasks.col.title=Title tasks.col.dueDate=Due Date tasks.col.taskState=Task State diff --git a/src/main/resources/static/css/main.css b/src/main/resources/static/css/main.css index 5a1cd6b7..0efe6b76 100644 --- a/src/main/resources/static/css/main.css +++ b/src/main/resources/static/css/main.css @@ -1,115 +1,95 @@ -/* main.css - (c) 2019 Thomas Woehlke */ -html { - position: relative; - min-height: 100%; -} - -body { - padding-top: 3.5rem; - padding-bottom: 3.5rem; - font-family: 'Lato', sans-serif; - line-height: 1.5; - /* - font-family: 'Varela Round', sans-serif; - font-family: 'Roboto', sans-serif; - font-family: 'Open Sans', sans-serif; - font-family: 'Poppins', sans-serif; - font-family: 'Lato', sans-serif; - font-family: 'Montserrat', sans-serif; - */ - /* - font-family: 'Nunito', sans-serif; - font-family: 'Open Sans', sans-serif; - font-family: 'Montserrat', sans-serif; - font-family: 'Lato', sans-serif; - */ -} - -h1,h2,h3,h4,h5,h6 { - font-family: 'Varela Round', sans-serif; - font-weight:bold -} - -tt,th,code,kbd,samp,pre{ - font-family: 'Varela Round', sans-serif; -} - - -.jumbotron { - border-radius: 0 !important; -} - -div#tw-content-title-actionbuttons { - margin-top: 1rem; -} - -div#collapseDescription { - margin-top: 1.5rem; -} - -@media (min-width: 576px){ - .jumbotron { - padding: 2rem 1rem !important; - } -} - -.footer { - position: absolute; - bottom: 0; - width: 100%; - /* Set the fixed height of the footer here */ - /* height: 30px; */ -} - -/* -.navbar { - padding: .25rem .5rem !important; -} - */ - -#taskStateNavigationContainer { - padding-top: 1rem; - padding-bottom: 1rem; -} - -.navbar-text-footer { - display: inline-block; -} - -.navbar-dark .navbar-text-footer { - color: rgba(255,255,255,.5); -} - -.nav-list { - padding-left: 10px; -} - -#rootCategory { - padding-left: 0px !important; -} - -#tw-main-section { - padding-bottom: 1rem !important; - margin-bottom: 1rem !important; -} - -#user-login-form { - margin-top: 1rem; - margin-bottom: 1rem; -} - -#user-login-form-more-information { - -} - -#newUser2UserMessageForm { - margin-bottom: 1rem; -} - -#tw-project-submenu-col { - padding-top: 0.75rem; -} - -#tw-project-submenu-root { - margin-top: 0.75rem; -} +/* main.css - (c) 2019 Thomas Woehlke */ + +html { + position: relative; + min-height: 100%; +} + +body { + padding-top: 3.5rem; + padding-bottom: 3.5rem; + font-family: 'Lato', sans-serif; + line-height: 1.5; +} + +h1, h2, h3, h4, h5, h6 { + font-family: 'Varela Round', sans-serif; + font-weight: bold +} + +tt, th, code, kbd, samp, pre { + font-family: 'Varela Round', sans-serif; +} + +.jumbotron { + border-radius: 0 !important; +} + +div#tw-content-title-actionbuttons { + margin-top: 1rem; +} + +div#collapseDescription { + margin-top: 1.5rem; +} + +@media (min-width: 576px) { + .jumbotron { + padding: 2rem 1rem !important; + } +} + +.footer { + position: absolute; + bottom: 0; + width: 100%; + /* Set the fixed height of the footer here */ + /* height: 30px; */ +} + +#taskStateNavigationContainer { + padding-top: 1rem; + padding-bottom: 1rem; +} + +.navbar-text-footer { + display: inline-block; +} + +.navbar-dark .navbar-text-footer { + color: rgba(255, 255, 255, .5); +} + +.nav-list { + padding-left: 10px; +} + +#rootCategory { + padding-left: 0px !important; +} + +#tw-main-section { + padding-bottom: 1rem !important; + margin-bottom: 1rem !important; +} + +#user-login-form { + margin-top: 1rem; + margin-bottom: 1rem; +} + +#user-login-form-more-information { + +} + +#newUser2UserMessageForm { + margin-bottom: 1rem; +} + +#tw-project-submenu-col { + padding-top: 0.75rem; +} + +#tw-project-submenu-root { + margin-top: 0.75rem; +} diff --git a/src/main/resources/templates/layout/navbartop.html b/src/main/resources/templates/layout/navbartop.html index e6cd714d..0302d64c 100644 --- a/src/main/resources/templates/layout/navbartop.html +++ b/src/main/resources/templates/layout/navbartop.html @@ -4,103 +4,102 @@ xmlns:sec="http://www.thymeleaf.org/extras/spring-security" xmlns:sd="http://www.thymeleaf.org/spring-data"> - + diff --git a/src/main/resources/templates/layout/page.html b/src/main/resources/templates/layout/page.html index 606327cf..0db6388c 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/main/resources/templates/layout/tasks.html b/src/main/resources/templates/layout/tasks.html index 81af9499..67bdd4ce 100644 --- a/src/main/resources/templates/layout/tasks.html +++ b/src/main/resources/templates/layout/tasks.html @@ -26,6 +26,7 @@   + Focus Title @@ -56,7 +57,6 @@ ondrop="dropTask2Task(event)" ondragover="allowDropOfTask(event)"> - + + + th:alt-title="#{task.col.twtooltip.show.details}" + th:text="${task.title}"> Launch Task Modal @@ -177,58 +180,57 @@
- - + +
- Task State + Task State Inbox diff --git a/src/test/java/org/woehlke/simpleworklist/SmokeTests.java b/src/test/java/org/woehlke/java/simpleworklist/test/SmokeTests.java similarity index 97% rename from src/test/java/org/woehlke/simpleworklist/SmokeTests.java rename to src/test/java/org/woehlke/java/simpleworklist/test/SmokeTests.java index 4a81f303..1927c7a3 100644 --- a/src/test/java/org/woehlke/simpleworklist/SmokeTests.java +++ b/src/test/java/org/woehlke/java/simpleworklist/test/SmokeTests.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist; +package org.woehlke.java.simpleworklist.test; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.*; @@ -14,7 +14,9 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.ResultActions; import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; -import org.woehlke.simpleworklist.application.config.UserAccountTestDataService; +import org.woehlke.java.simpleworklist.SimpleworklistApplication; +import org.woehlke.java.simpleworklist.test.application.config.FunctionalRequirements; +import org.woehlke.java.simpleworklist.test.application.config.UserAccountTestDataService; import java.net.URL; @@ -24,7 +26,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; -import static org.woehlke.simpleworklist.application.config.Requirements.*; +import static org.woehlke.java.simpleworklist.test.application.config.Requirements.*; @Slf4j @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/src/test/java/org/woehlke/simpleworklist/application/config/AbstractTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/application/config/AbstractTest.java similarity index 84% rename from src/test/java/org/woehlke/simpleworklist/application/config/AbstractTest.java rename to src/test/java/org/woehlke/java/simpleworklist/test/application/config/AbstractTest.java index b88e9e28..8dcd7955 100644 --- a/src/test/java/org/woehlke/simpleworklist/application/config/AbstractTest.java +++ b/src/test/java/org/woehlke/java/simpleworklist/test/application/config/AbstractTest.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.application.config; +package org.woehlke.java.simpleworklist.test.application.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -7,13 +7,13 @@ import org.springframework.security.core.userdetails.UserDetails; import org.springframework.test.web.servlet.MockMvc; import org.springframework.web.context.WebApplicationContext; -import org.woehlke.simpleworklist.application.helper.TestHelperService; -import org.woehlke.simpleworklist.config.SimpleworklistProperties; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; -import org.woehlke.simpleworklist.domain.user.account.UserAccountService; -import org.woehlke.simpleworklist.domain.user.access.UserAuthorizationService; -import org.woehlke.simpleworklist.domain.user.access.ApplicationUserDetailsService; -import org.woehlke.simpleworklist.domain.user.login.UserAccountLoginSuccessService; +import org.woehlke.java.simpleworklist.test.application.helper.TestHelperService; +import org.woehlke.java.simpleworklist.config.SimpleworklistProperties; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccountService; +import org.woehlke.java.simpleworklist.domain.user.access.UserAuthorizationService; +import org.woehlke.java.simpleworklist.domain.user.access.ApplicationUserDetailsService; +import org.woehlke.java.simpleworklist.domain.user.login.UserAccountLoginSuccessService; import java.net.URL; diff --git a/src/test/java/org/woehlke/simpleworklist/application/config/FunctionalRequirements.java b/src/test/java/org/woehlke/java/simpleworklist/test/application/config/FunctionalRequirements.java similarity index 94% rename from src/test/java/org/woehlke/simpleworklist/application/config/FunctionalRequirements.java rename to src/test/java/org/woehlke/java/simpleworklist/test/application/config/FunctionalRequirements.java index 6b06ae35..c47f1fd9 100644 --- a/src/test/java/org/woehlke/simpleworklist/application/config/FunctionalRequirements.java +++ b/src/test/java/org/woehlke/java/simpleworklist/test/application/config/FunctionalRequirements.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.application.config; +package org.woehlke.java.simpleworklist.test.application.config; public enum FunctionalRequirements { diff --git a/src/test/java/org/woehlke/simpleworklist/application/config/Requirements.java b/src/test/java/org/woehlke/java/simpleworklist/test/application/config/Requirements.java similarity index 91% rename from src/test/java/org/woehlke/simpleworklist/application/config/Requirements.java rename to src/test/java/org/woehlke/java/simpleworklist/test/application/config/Requirements.java index 34c4d721..5cd5dab8 100644 --- a/src/test/java/org/woehlke/simpleworklist/application/config/Requirements.java +++ b/src/test/java/org/woehlke/java/simpleworklist/test/application/config/Requirements.java @@ -1,8 +1,8 @@ -package org.woehlke.simpleworklist.application.config; +package org.woehlke.java.simpleworklist.test.application.config; public interface Requirements { -String Functional_Requirements = "Functional Requirements"; + String Functional_Requirements = "Functional Requirements"; String F001 = "F001 Server Starts"; String F002 = "F002 Home Page rendered"; diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/application/config/UserAccountTestDataService.java b/src/test/java/org/woehlke/java/simpleworklist/test/application/config/UserAccountTestDataService.java new file mode 100644 index 00000000..3b7d87d6 --- /dev/null +++ b/src/test/java/org/woehlke/java/simpleworklist/test/application/config/UserAccountTestDataService.java @@ -0,0 +1,11 @@ +package org.woehlke.java.simpleworklist.test.application.config; + +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; + +public interface UserAccountTestDataService { + + void setUp(); + + UserAccount getFirstUserAccount(); + +} diff --git a/src/test/java/org/woehlke/simpleworklist/application/config/UserAccountTestDataServiceImpl.java b/src/test/java/org/woehlke/java/simpleworklist/test/application/config/UserAccountTestDataServiceImpl.java similarity index 84% rename from src/test/java/org/woehlke/simpleworklist/application/config/UserAccountTestDataServiceImpl.java rename to src/test/java/org/woehlke/java/simpleworklist/test/application/config/UserAccountTestDataServiceImpl.java index 32dbbad5..1caf1c8e 100644 --- a/src/test/java/org/woehlke/simpleworklist/application/config/UserAccountTestDataServiceImpl.java +++ b/src/test/java/org/woehlke/java/simpleworklist/test/application/config/UserAccountTestDataServiceImpl.java @@ -1,16 +1,16 @@ -package org.woehlke.simpleworklist.application.config; +package org.woehlke.java.simpleworklist.test.application.config; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.woehlke.simpleworklist.config.SimpleworklistProperties; -import org.woehlke.simpleworklist.domain.context.Context; -import org.woehlke.simpleworklist.domain.context.ContextService; -import org.woehlke.simpleworklist.domain.context.NewContextForm; -import org.woehlke.simpleworklist.domain.language.Language; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; -import org.woehlke.simpleworklist.domain.user.account.UserAccountService; +import org.woehlke.java.simpleworklist.config.SimpleworklistProperties; +import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.context.ContextService; +import org.woehlke.java.simpleworklist.domain.context.NewContextForm; +import org.woehlke.java.simpleworklist.domain.language.Language; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccountService; import java.util.Date; diff --git a/src/test/java/org/woehlke/simpleworklist/application/helper/TestHelperService.java b/src/test/java/org/woehlke/java/simpleworklist/test/application/helper/TestHelperService.java similarity index 64% rename from src/test/java/org/woehlke/simpleworklist/application/helper/TestHelperService.java rename to src/test/java/org/woehlke/java/simpleworklist/test/application/helper/TestHelperService.java index dec9ef8f..fb39ab48 100644 --- a/src/test/java/org/woehlke/simpleworklist/application/helper/TestHelperService.java +++ b/src/test/java/org/woehlke/java/simpleworklist/test/application/helper/TestHelperService.java @@ -1,7 +1,7 @@ -package org.woehlke.simpleworklist.application.helper; +package org.woehlke.java.simpleworklist.test.application.helper; -import org.woehlke.simpleworklist.domain.user.passwordrecovery.UserPasswordRecovery; -import org.woehlke.simpleworklist.domain.user.signup.UserRegistration; +import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserPasswordRecovery; +import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistration; public interface TestHelperService { diff --git a/src/test/java/org/woehlke/simpleworklist/application/helper/TestHelperServiceImpl.java b/src/test/java/org/woehlke/java/simpleworklist/test/application/helper/TestHelperServiceImpl.java similarity index 78% rename from src/test/java/org/woehlke/simpleworklist/application/helper/TestHelperServiceImpl.java rename to src/test/java/org/woehlke/java/simpleworklist/test/application/helper/TestHelperServiceImpl.java index 5f617c6f..d619f299 100644 --- a/src/test/java/org/woehlke/simpleworklist/application/helper/TestHelperServiceImpl.java +++ b/src/test/java/org/woehlke/java/simpleworklist/test/application/helper/TestHelperServiceImpl.java @@ -1,18 +1,18 @@ -package org.woehlke.simpleworklist.application.helper; +package org.woehlke.java.simpleworklist.test.application.helper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import org.woehlke.simpleworklist.domain.project.Project; -import org.woehlke.simpleworklist.domain.project.ProjectRepository; -import org.woehlke.simpleworklist.domain.user.signup.UserRegistrationRepository; -import org.woehlke.simpleworklist.domain.user.passwordrecovery.UserPasswordRecovery; -import org.woehlke.simpleworklist.domain.user.signup.UserRegistration; +import org.woehlke.java.simpleworklist.domain.project.Project; +import org.woehlke.java.simpleworklist.domain.project.ProjectRepository; +import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistrationRepository; +import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserPasswordRecovery; +import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistration; import org.springframework.beans.factory.annotation.Autowired; -import org.woehlke.simpleworklist.domain.task.TaskRepository; -import org.woehlke.simpleworklist.domain.user.account.UserAccountRepository; -import org.woehlke.simpleworklist.domain.user.passwordrecovery.UserPasswordRecoveryRepository; +import org.woehlke.java.simpleworklist.domain.task.TaskRepository; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccountRepository; +import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserPasswordRecoveryRepository; import javax.validation.constraints.Email; import javax.validation.constraints.NotBlank; diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/context/ContextControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/context/ContextControllerTest.java new file mode 100644 index 00000000..e4557d5d --- /dev/null +++ b/src/test/java/org/woehlke/java/simpleworklist/test/context/ContextControllerTest.java @@ -0,0 +1,4 @@ +package org.woehlke.java.simpleworklist.test.context; + +public class ContextControllerTest { +} diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/context/ContextServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/context/ContextServiceTest.java new file mode 100644 index 00000000..c12cd26c --- /dev/null +++ b/src/test/java/org/woehlke/java/simpleworklist/test/context/ContextServiceTest.java @@ -0,0 +1,4 @@ +package org.woehlke.java.simpleworklist.test.context; + +public class ContextServiceTest { +} diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/project/ProjectControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/project/ProjectControllerTest.java new file mode 100644 index 00000000..ad426efb --- /dev/null +++ b/src/test/java/org/woehlke/java/simpleworklist/test/project/ProjectControllerTest.java @@ -0,0 +1,4 @@ +package org.woehlke.java.simpleworklist.test.project; + +public class ProjectControllerTest { +} diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/project/ProjectServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/project/ProjectServiceTest.java new file mode 100644 index 00000000..91e8f5cb --- /dev/null +++ b/src/test/java/org/woehlke/java/simpleworklist/test/project/ProjectServiceTest.java @@ -0,0 +1,4 @@ +package org.woehlke.java.simpleworklist.test.project; + +public class ProjectServiceTest { +} diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/search/SearchControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/search/SearchControllerTest.java new file mode 100644 index 00000000..878e6afe --- /dev/null +++ b/src/test/java/org/woehlke/java/simpleworklist/test/search/SearchControllerTest.java @@ -0,0 +1,4 @@ +package org.woehlke.java.simpleworklist.test.search; + +public class SearchControllerTest { +} diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/search/SearchServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/search/SearchServiceTest.java new file mode 100644 index 00000000..fa18bab4 --- /dev/null +++ b/src/test/java/org/woehlke/java/simpleworklist/test/search/SearchServiceTest.java @@ -0,0 +1,4 @@ +package org.woehlke.java.simpleworklist.test.search; + +public class SearchServiceTest { +} diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskControllerTest.java new file mode 100644 index 00000000..68c6e193 --- /dev/null +++ b/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskControllerTest.java @@ -0,0 +1,4 @@ +package org.woehlke.java.simpleworklist.test.task; + +public class TaskControllerTest { +} diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskMoveControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskMoveControllerTest.java new file mode 100644 index 00000000..1a86829a --- /dev/null +++ b/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskMoveControllerTest.java @@ -0,0 +1,4 @@ +package org.woehlke.java.simpleworklist.test.task; + +public class TaskMoveControllerTest { +} diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskMoveServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskMoveServiceTest.java new file mode 100644 index 00000000..590d93cd --- /dev/null +++ b/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskMoveServiceTest.java @@ -0,0 +1,4 @@ +package org.woehlke.java.simpleworklist.test.task; + +public class TaskMoveServiceTest { +} diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskServiceTest.java new file mode 100644 index 00000000..0ad78565 --- /dev/null +++ b/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskServiceTest.java @@ -0,0 +1,4 @@ +package org.woehlke.java.simpleworklist.test.task; + +public class TaskServiceTest { +} diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskStateControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskStateControllerTest.java new file mode 100644 index 00000000..97da69dc --- /dev/null +++ b/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskStateControllerTest.java @@ -0,0 +1,4 @@ +package org.woehlke.java.simpleworklist.test.task; + +public class TaskStateControllerTest { +} diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskStateServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskStateServiceTest.java new file mode 100644 index 00000000..4d627672 --- /dev/null +++ b/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskStateServiceTest.java @@ -0,0 +1,4 @@ +package org.woehlke.java.simpleworklist.test.task; + +public class TaskStateServiceTest { +} diff --git a/src/test/java/org/woehlke/simpleworklist/test/testdata/TestDataServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/testdata/TestDataServiceTest.java similarity index 85% rename from src/test/java/org/woehlke/simpleworklist/test/testdata/TestDataServiceTest.java rename to src/test/java/org/woehlke/java/simpleworklist/test/testdata/TestDataServiceTest.java index 2f1244b5..f141ab84 100644 --- a/src/test/java/org/woehlke/simpleworklist/test/testdata/TestDataServiceTest.java +++ b/src/test/java/org/woehlke/java/simpleworklist/test/testdata/TestDataServiceTest.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.test.testdata; +package org.woehlke.java.simpleworklist.test.testdata; import lombok.extern.slf4j.Slf4j; @@ -10,9 +10,9 @@ import org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext; import org.springframework.test.web.servlet.MockMvc; import org.springframework.web.context.WebApplicationContext; -import org.woehlke.simpleworklist.application.config.UserAccountTestDataService; -import org.woehlke.simpleworklist.domain.testdata.TestDataService; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.test.application.config.UserAccountTestDataService; +import org.woehlke.java.simpleworklist.domain.testdata.TestDataService; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; import java.net.URL; diff --git a/src/test/java/org/woehlke/simpleworklist/user/UserDetailsBeanTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/user/UserDetailsBeanTest.java similarity index 95% rename from src/test/java/org/woehlke/simpleworklist/user/UserDetailsBeanTest.java rename to src/test/java/org/woehlke/java/simpleworklist/test/user/UserDetailsBeanTest.java index 049b00e6..5437de31 100644 --- a/src/test/java/org/woehlke/simpleworklist/user/UserDetailsBeanTest.java +++ b/src/test/java/org/woehlke/java/simpleworklist/test/user/UserDetailsBeanTest.java @@ -1,10 +1,10 @@ -package org.woehlke.simpleworklist.user; +package org.woehlke.java.simpleworklist.test.user; import org.springframework.security.core.GrantedAuthority; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; -import org.woehlke.simpleworklist.domain.user.access.UserDetailsDto; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.user.access.UserDetailsDto; import java.util.Collection; diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountAccessServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountAccessServiceTest.java new file mode 100644 index 00000000..bb4b8c75 --- /dev/null +++ b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountAccessServiceTest.java @@ -0,0 +1,4 @@ +package org.woehlke.java.simpleworklist.test.user.domain.account; + +public class UserAccountAccessServiceTest { +} diff --git a/src/test/java/org/woehlke/simpleworklist/user/domain/account/UserAccountPasswordEncodedTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountPasswordEncodedTest.java similarity index 87% rename from src/test/java/org/woehlke/simpleworklist/user/domain/account/UserAccountPasswordEncodedTest.java rename to src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountPasswordEncodedTest.java index 5d29d8b2..db9410dd 100644 --- a/src/test/java/org/woehlke/simpleworklist/user/domain/account/UserAccountPasswordEncodedTest.java +++ b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountPasswordEncodedTest.java @@ -1,11 +1,11 @@ -package org.woehlke.simpleworklist.user.domain.account; +package org.woehlke.java.simpleworklist.test.user.domain.account; import org.springframework.security.crypto.password.PasswordEncoder; -import org.woehlke.simpleworklist.application.config.AbstractTest; +import org.woehlke.java.simpleworklist.test.application.config.AbstractTest; import org.springframework.beans.factory.annotation.Autowired; -import org.woehlke.simpleworklist.domain.user.account.UserAccountForm; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccountForm; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountSecurityServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountSecurityServiceTest.java new file mode 100644 index 00000000..ec50932b --- /dev/null +++ b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountSecurityServiceTest.java @@ -0,0 +1,4 @@ +package org.woehlke.java.simpleworklist.test.user.domain.account; + +public class UserAccountSecurityServiceTest { +} diff --git a/src/test/java/org/woehlke/simpleworklist/user/domain/account/UserAccountServiceImplTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountServiceImplTest.java similarity index 93% rename from src/test/java/org/woehlke/simpleworklist/user/domain/account/UserAccountServiceImplTest.java rename to src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountServiceImplTest.java index 741e66a5..9c2df79f 100644 --- a/src/test/java/org/woehlke/simpleworklist/user/domain/account/UserAccountServiceImplTest.java +++ b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountServiceImplTest.java @@ -1,4 +1,4 @@ -package org.woehlke.simpleworklist.user.domain.account; +package org.woehlke.java.simpleworklist.test.user.domain.account; import org.springframework.beans.factory.annotation.Autowired; @@ -8,12 +8,12 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UsernameNotFoundException; -import org.woehlke.simpleworklist.application.config.AbstractTest; -import org.woehlke.simpleworklist.domain.user.account.UserAccount; -import org.woehlke.simpleworklist.domain.user.account.UserAccountForm; -import org.woehlke.simpleworklist.domain.user.passwordrecovery.UserPasswordRecoveryService; -import org.woehlke.simpleworklist.domain.user.signup.UserRegistrationService; -import org.woehlke.simpleworklist.domain.user.login.LoginForm; +import org.woehlke.java.simpleworklist.test.application.config.AbstractTest; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.user.account.UserAccountForm; +import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserPasswordRecoveryService; +import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistrationService; +import org.woehlke.java.simpleworklist.domain.user.login.LoginForm; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountServiceTest.java new file mode 100644 index 00000000..31ab935e --- /dev/null +++ b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountServiceTest.java @@ -0,0 +1,4 @@ +package org.woehlke.java.simpleworklist.test.user.domain.account; + +public class UserAccountServiceTest { +} diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/chat/User2UserMessageControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/chat/User2UserMessageControllerTest.java new file mode 100644 index 00000000..f4ae279c --- /dev/null +++ b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/chat/User2UserMessageControllerTest.java @@ -0,0 +1,4 @@ +package org.woehlke.java.simpleworklist.test.user.domain.chat; + +public class User2UserMessageControllerTest { +} diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/chat/User2UserMessageServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/chat/User2UserMessageServiceTest.java new file mode 100644 index 00000000..966d6d37 --- /dev/null +++ b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/chat/User2UserMessageServiceTest.java @@ -0,0 +1,4 @@ +package org.woehlke.java.simpleworklist.test.user.domain.chat; + +public class User2UserMessageServiceTest { +} diff --git a/src/test/java/org/woehlke/simpleworklist/user/domain/register/UserRegistrationControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/register/UserRegistrationControllerTest.java similarity index 85% rename from src/test/java/org/woehlke/simpleworklist/user/domain/register/UserRegistrationControllerTest.java rename to src/test/java/org/woehlke/java/simpleworklist/test/user/domain/register/UserRegistrationControllerTest.java index bf8980d9..91024f5e 100644 --- a/src/test/java/org/woehlke/simpleworklist/user/domain/register/UserRegistrationControllerTest.java +++ b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/register/UserRegistrationControllerTest.java @@ -1,11 +1,11 @@ -package org.woehlke.simpleworklist.user.domain.register; +package org.woehlke.java.simpleworklist.test.user.domain.register; -import org.woehlke.simpleworklist.application.config.AbstractTest; +import org.woehlke.java.simpleworklist.test.application.config.AbstractTest; import org.springframework.beans.factory.annotation.Autowired; -import org.woehlke.simpleworklist.domain.user.signup.UserRegistration; -import org.woehlke.simpleworklist.domain.user.signup.UserRegistrationStatus; -import org.woehlke.simpleworklist.domain.user.signup.UserRegistrationService; +import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistration; +import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistrationStatus; +import org.woehlke.java.simpleworklist.domain.user.signup.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/domain/register/UserRegistrationServiceImplTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/register/UserRegistrationServiceImplTest.java similarity index 85% rename from src/test/java/org/woehlke/simpleworklist/user/domain/register/UserRegistrationServiceImplTest.java rename to src/test/java/org/woehlke/java/simpleworklist/test/user/domain/register/UserRegistrationServiceImplTest.java index 3c2f212d..c083146b 100644 --- a/src/test/java/org/woehlke/simpleworklist/user/domain/register/UserRegistrationServiceImplTest.java +++ b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/register/UserRegistrationServiceImplTest.java @@ -1,13 +1,13 @@ -package org.woehlke.simpleworklist.user.domain.register; +package org.woehlke.java.simpleworklist.test.user.domain.register; import org.springframework.beans.factory.annotation.Value; -import org.woehlke.simpleworklist.application.config.AbstractTest; -import org.woehlke.simpleworklist.domain.user.signup.UserRegistration; -import org.woehlke.simpleworklist.domain.user.passwordrecovery.UserPasswordRecovery; -import org.woehlke.simpleworklist.domain.user.passwordrecovery.UserPasswordRecoveryService; +import org.woehlke.java.simpleworklist.test.application.config.AbstractTest; +import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistration; +import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserPasswordRecovery; +import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserPasswordRecoveryService; import org.springframework.beans.factory.annotation.Autowired; -import org.woehlke.simpleworklist.domain.user.signup.UserRegistrationService; +import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistrationService; import java.util.Date; diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/register/UserRegistrationServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/register/UserRegistrationServiceTest.java new file mode 100644 index 00000000..95c0871e --- /dev/null +++ b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/register/UserRegistrationServiceTest.java @@ -0,0 +1,4 @@ +package org.woehlke.java.simpleworklist.test.user.domain.register; + +public class UserRegistrationServiceTest { +} diff --git a/src/test/java/org/woehlke/simpleworklist/user/domain/resetpassword/UserPasswordRecoveryControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/resetpassword/UserPasswordRecoveryControllerTest.java similarity index 84% rename from src/test/java/org/woehlke/simpleworklist/user/domain/resetpassword/UserPasswordRecoveryControllerTest.java rename to src/test/java/org/woehlke/java/simpleworklist/test/user/domain/resetpassword/UserPasswordRecoveryControllerTest.java index 65dc7c0c..2f02d978 100644 --- a/src/test/java/org/woehlke/simpleworklist/user/domain/resetpassword/UserPasswordRecoveryControllerTest.java +++ b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/resetpassword/UserPasswordRecoveryControllerTest.java @@ -1,11 +1,11 @@ -package org.woehlke.simpleworklist.user.domain.resetpassword; +package org.woehlke.java.simpleworklist.test.user.domain.resetpassword; -import org.woehlke.simpleworklist.application.config.AbstractTest; +import org.woehlke.java.simpleworklist.test.application.config.AbstractTest; import org.springframework.beans.factory.annotation.Autowired; -import org.woehlke.simpleworklist.domain.user.passwordrecovery.UserPasswordRecovery; -import org.woehlke.simpleworklist.domain.user.passwordrecovery.UserPasswordRecoveryStatus; -import org.woehlke.simpleworklist.domain.user.passwordrecovery.UserPasswordRecoveryService; +import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserPasswordRecovery; +import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserPasswordRecoveryStatus; +import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserPasswordRecoveryService; import static org.hamcrest.Matchers.containsString; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/resetpassword/UserPasswordRecoveryServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/resetpassword/UserPasswordRecoveryServiceTest.java new file mode 100644 index 00000000..8654d3d8 --- /dev/null +++ b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/resetpassword/UserPasswordRecoveryServiceTest.java @@ -0,0 +1,4 @@ +package org.woehlke.java.simpleworklist.test.user.domain.resetpassword; + +public class UserPasswordRecoveryServiceTest { +} diff --git a/src/test/java/org/woehlke/simpleworklist/user/login/UserLoginControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/user/login/UserLoginControllerTest.java similarity index 83% rename from src/test/java/org/woehlke/simpleworklist/user/login/UserLoginControllerTest.java rename to src/test/java/org/woehlke/java/simpleworklist/test/user/login/UserLoginControllerTest.java index f78e9776..d09c1f3b 100644 --- a/src/test/java/org/woehlke/simpleworklist/user/login/UserLoginControllerTest.java +++ b/src/test/java/org/woehlke/java/simpleworklist/test/user/login/UserLoginControllerTest.java @@ -1,11 +1,11 @@ -package org.woehlke.simpleworklist.user.login; +package org.woehlke.java.simpleworklist.test.user.login; import static org.hamcrest.Matchers.containsString; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view; -import org.woehlke.simpleworklist.application.config.AbstractTest; +import org.woehlke.java.simpleworklist.test.application.config.AbstractTest; public class UserLoginControllerTest extends AbstractTest { diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/user/selfservice/UserSelfserviceControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/user/selfservice/UserSelfserviceControllerTest.java new file mode 100644 index 00000000..7baf1589 --- /dev/null +++ b/src/test/java/org/woehlke/java/simpleworklist/test/user/selfservice/UserSelfserviceControllerTest.java @@ -0,0 +1,4 @@ +package org.woehlke.java.simpleworklist.test.user.selfservice; + +public class UserSelfserviceControllerTest { +} diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/user/token/TokenGeneratorServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/user/token/TokenGeneratorServiceTest.java new file mode 100644 index 00000000..37d6f293 --- /dev/null +++ b/src/test/java/org/woehlke/java/simpleworklist/test/user/token/TokenGeneratorServiceTest.java @@ -0,0 +1,4 @@ +package org.woehlke.java.simpleworklist.test.user.token; + +public class TokenGeneratorServiceTest { +} diff --git a/src/test/java/org/woehlke/simpleworklist/application/config/UserAccountTestDataService.java b/src/test/java/org/woehlke/simpleworklist/application/config/UserAccountTestDataService.java deleted file mode 100644 index 6f3a2c30..00000000 --- a/src/test/java/org/woehlke/simpleworklist/application/config/UserAccountTestDataService.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.woehlke.simpleworklist.application.config; - -import org.woehlke.simpleworklist.domain.user.account.UserAccount; - -public interface UserAccountTestDataService { - - void setUp(); - - UserAccount getFirstUserAccount(); - -} diff --git a/src/test/java/org/woehlke/simpleworklist/context/ContextControllerTest.java b/src/test/java/org/woehlke/simpleworklist/context/ContextControllerTest.java deleted file mode 100644 index 668960e8..00000000 --- a/src/test/java/org/woehlke/simpleworklist/context/ContextControllerTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.woehlke.simpleworklist.context; - -public class ContextControllerTest { -} diff --git a/src/test/java/org/woehlke/simpleworklist/context/ContextServiceTest.java b/src/test/java/org/woehlke/simpleworklist/context/ContextServiceTest.java deleted file mode 100644 index 2056e989..00000000 --- a/src/test/java/org/woehlke/simpleworklist/context/ContextServiceTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.woehlke.simpleworklist.context; - -public class ContextServiceTest { -} diff --git a/src/test/java/org/woehlke/simpleworklist/project/ProjectControllerTest.java b/src/test/java/org/woehlke/simpleworklist/project/ProjectControllerTest.java deleted file mode 100644 index 7e6a5dcd..00000000 --- a/src/test/java/org/woehlke/simpleworklist/project/ProjectControllerTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.woehlke.simpleworklist.project; - -public class ProjectControllerTest { -} diff --git a/src/test/java/org/woehlke/simpleworklist/project/ProjectServiceTest.java b/src/test/java/org/woehlke/simpleworklist/project/ProjectServiceTest.java deleted file mode 100644 index 5fc9fcd1..00000000 --- a/src/test/java/org/woehlke/simpleworklist/project/ProjectServiceTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.woehlke.simpleworklist.project; - -public class ProjectServiceTest { -} diff --git a/src/test/java/org/woehlke/simpleworklist/search/SearchControllerTest.java b/src/test/java/org/woehlke/simpleworklist/search/SearchControllerTest.java deleted file mode 100644 index c276adb1..00000000 --- a/src/test/java/org/woehlke/simpleworklist/search/SearchControllerTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.woehlke.simpleworklist.search; - -public class SearchControllerTest { -} diff --git a/src/test/java/org/woehlke/simpleworklist/search/SearchServiceTest.java b/src/test/java/org/woehlke/simpleworklist/search/SearchServiceTest.java deleted file mode 100644 index 1d269c59..00000000 --- a/src/test/java/org/woehlke/simpleworklist/search/SearchServiceTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.woehlke.simpleworklist.search; - -public class SearchServiceTest { -} diff --git a/src/test/java/org/woehlke/simpleworklist/task/TaskControllerTest.java b/src/test/java/org/woehlke/simpleworklist/task/TaskControllerTest.java deleted file mode 100644 index 385cab40..00000000 --- a/src/test/java/org/woehlke/simpleworklist/task/TaskControllerTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.woehlke.simpleworklist.task; - -public class TaskControllerTest { -} diff --git a/src/test/java/org/woehlke/simpleworklist/task/TaskMoveControllerTest.java b/src/test/java/org/woehlke/simpleworklist/task/TaskMoveControllerTest.java deleted file mode 100644 index 4cc2d662..00000000 --- a/src/test/java/org/woehlke/simpleworklist/task/TaskMoveControllerTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.woehlke.simpleworklist.task; - -public class TaskMoveControllerTest { -} diff --git a/src/test/java/org/woehlke/simpleworklist/task/TaskMoveServiceTest.java b/src/test/java/org/woehlke/simpleworklist/task/TaskMoveServiceTest.java deleted file mode 100644 index 882f22ce..00000000 --- a/src/test/java/org/woehlke/simpleworklist/task/TaskMoveServiceTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.woehlke.simpleworklist.task; - -public class TaskMoveServiceTest { -} diff --git a/src/test/java/org/woehlke/simpleworklist/task/TaskServiceTest.java b/src/test/java/org/woehlke/simpleworklist/task/TaskServiceTest.java deleted file mode 100644 index d776997b..00000000 --- a/src/test/java/org/woehlke/simpleworklist/task/TaskServiceTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.woehlke.simpleworklist.task; - -public class TaskServiceTest { -} diff --git a/src/test/java/org/woehlke/simpleworklist/task/TaskStateControllerTest.java b/src/test/java/org/woehlke/simpleworklist/task/TaskStateControllerTest.java deleted file mode 100644 index ec1bc5f9..00000000 --- a/src/test/java/org/woehlke/simpleworklist/task/TaskStateControllerTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.woehlke.simpleworklist.task; - -public class TaskStateControllerTest { -} diff --git a/src/test/java/org/woehlke/simpleworklist/task/TaskStateServiceTest.java b/src/test/java/org/woehlke/simpleworklist/task/TaskStateServiceTest.java deleted file mode 100644 index 72f952a4..00000000 --- a/src/test/java/org/woehlke/simpleworklist/task/TaskStateServiceTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.woehlke.simpleworklist.task; - -public class TaskStateServiceTest { -} diff --git a/src/test/java/org/woehlke/simpleworklist/user/domain/account/UserAccountAccessServiceTest.java b/src/test/java/org/woehlke/simpleworklist/user/domain/account/UserAccountAccessServiceTest.java deleted file mode 100644 index e36d68ea..00000000 --- a/src/test/java/org/woehlke/simpleworklist/user/domain/account/UserAccountAccessServiceTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.woehlke.simpleworklist.user.domain.account; - -public class UserAccountAccessServiceTest { -} diff --git a/src/test/java/org/woehlke/simpleworklist/user/domain/account/UserAccountSecurityServiceTest.java b/src/test/java/org/woehlke/simpleworklist/user/domain/account/UserAccountSecurityServiceTest.java deleted file mode 100644 index a4be7d25..00000000 --- a/src/test/java/org/woehlke/simpleworklist/user/domain/account/UserAccountSecurityServiceTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.woehlke.simpleworklist.user.domain.account; - -public class UserAccountSecurityServiceTest { -} diff --git a/src/test/java/org/woehlke/simpleworklist/user/domain/account/UserAccountServiceTest.java b/src/test/java/org/woehlke/simpleworklist/user/domain/account/UserAccountServiceTest.java deleted file mode 100644 index edaecf10..00000000 --- a/src/test/java/org/woehlke/simpleworklist/user/domain/account/UserAccountServiceTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.woehlke.simpleworklist.user.domain.account; - -public class UserAccountServiceTest { -} diff --git a/src/test/java/org/woehlke/simpleworklist/user/domain/chat/User2UserMessageControllerTest.java b/src/test/java/org/woehlke/simpleworklist/user/domain/chat/User2UserMessageControllerTest.java deleted file mode 100644 index c2cc6e00..00000000 --- a/src/test/java/org/woehlke/simpleworklist/user/domain/chat/User2UserMessageControllerTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.woehlke.simpleworklist.user.domain.chat; - -public class User2UserMessageControllerTest { -} diff --git a/src/test/java/org/woehlke/simpleworklist/user/domain/chat/User2UserMessageServiceTest.java b/src/test/java/org/woehlke/simpleworklist/user/domain/chat/User2UserMessageServiceTest.java deleted file mode 100644 index f803340a..00000000 --- a/src/test/java/org/woehlke/simpleworklist/user/domain/chat/User2UserMessageServiceTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.woehlke.simpleworklist.user.domain.chat; - -public class User2UserMessageServiceTest { -} diff --git a/src/test/java/org/woehlke/simpleworklist/user/domain/register/UserRegistrationServiceTest.java b/src/test/java/org/woehlke/simpleworklist/user/domain/register/UserRegistrationServiceTest.java deleted file mode 100644 index 0480cb2d..00000000 --- a/src/test/java/org/woehlke/simpleworklist/user/domain/register/UserRegistrationServiceTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.woehlke.simpleworklist.user.domain.register; - -public class UserRegistrationServiceTest { -} diff --git a/src/test/java/org/woehlke/simpleworklist/user/domain/resetpassword/UserPasswordRecoveryServiceTest.java b/src/test/java/org/woehlke/simpleworklist/user/domain/resetpassword/UserPasswordRecoveryServiceTest.java deleted file mode 100644 index d1ffc271..00000000 --- a/src/test/java/org/woehlke/simpleworklist/user/domain/resetpassword/UserPasswordRecoveryServiceTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.woehlke.simpleworklist.user.domain.resetpassword; - -public class UserPasswordRecoveryServiceTest { -} diff --git a/src/test/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceControllerTest.java b/src/test/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceControllerTest.java deleted file mode 100644 index f503f6cb..00000000 --- a/src/test/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceControllerTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.woehlke.simpleworklist.user.selfservice; - -public class UserSelfserviceControllerTest { -} diff --git a/src/test/java/org/woehlke/simpleworklist/user/token/TokenGeneratorServiceTest.java b/src/test/java/org/woehlke/simpleworklist/user/token/TokenGeneratorServiceTest.java deleted file mode 100644 index 34098348..00000000 --- a/src/test/java/org/woehlke/simpleworklist/user/token/TokenGeneratorServiceTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.woehlke.simpleworklist.user.token; - -public class TokenGeneratorServiceTest { -} diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml index 12476635..966d75d2 100644 --- a/src/test/resources/application.yml +++ b/src/test/resources/application.yml @@ -51,58 +51,59 @@ spring: continue-on-error: true org: woehlke: - simpleworklist: - mail: - host: ${SIMPLEWORKLIST_MAIL_SMTP_HOST} - port: ${SIMPLEWORKLIST_MAIL_SMTP_PORT} - username: ${SIMPLEWORKLIST_MAIL_SMTP_USERNAME} - password: ${SIMPLEWORKLIST_MAIL_SMTP_PASSWORD} - auth: true - sslEnable: true - socketFactoryPort: 465 - socketFactoryClass: javax.net.ssl.SSLSocketFactory - registration: - maxRetries: 5 - ttlEmailVerificationRequest: 86400000 - urlHost: ${SIMPLEWORKLIST_URL_APP_HOST} - mailFrom: ${SIMPLEWORKLIST_MAIL_FROM} - webMvc: - controllerPageSize: 10 - staticResourceHandler: - - "/css" - - "/img" - - "/js" - dynamicResourceHandler: - - "/webjars" - webSecurity: - strengthBCryptPasswordEncoder: 10 - # iterations: ${SIMPLEWORKLIST_USER_ITERATIONS} - # hashWidth: ${SIMPLEWORKLIST_USER_HASH_WIDTH} - # secret: ${SIMPLEWORKLIST_USER_SECRET} - loginProcessingUrl: "/j_spring_security_check" - logoutUrl: "/user/logout" - cookieNamesToClear: - - "JSESSIONID" - invalidateHttpSession: true - defaultSuccessUrl: "/" - failureForwardUrl: "/user/login?login_error=1" - usernameParameter: "j_username" - passwordParameter: "j_password" - loginPage: "/user/login" - antPatternsPublic: - - "/webjars/**" - - "/css/**" - - "/img/**" - - "/js/**" - - "/favicon.ico" - - "/user/login*" - - "/user/register*" - - "/user/register/**" - - "/user/register/confirm/**" - - "/user/resetPassword*" - - "/user/resetPassword/**" - - "/user/resetPassword/confirm/**" - - "/error*" + java: + simpleworklist: + mail: + host: ${SIMPLEWORKLIST_MAIL_SMTP_HOST} + port: ${SIMPLEWORKLIST_MAIL_SMTP_PORT} + username: ${SIMPLEWORKLIST_MAIL_SMTP_USERNAME} + password: ${SIMPLEWORKLIST_MAIL_SMTP_PASSWORD} + auth: true + sslEnable: true + socketFactoryPort: 465 + socketFactoryClass: javax.net.ssl.SSLSocketFactory + registration: + maxRetries: 5 + ttlEmailVerificationRequest: 86400000 + urlHost: ${SIMPLEWORKLIST_URL_APP_HOST} + mailFrom: ${SIMPLEWORKLIST_MAIL_FROM} + webMvc: + controllerPageSize: 10 + staticResourceHandler: + - "/css" + - "/img" + - "/js" + dynamicResourceHandler: + - "/webjars" + webSecurity: + strengthBCryptPasswordEncoder: 10 + # iterations: ${SIMPLEWORKLIST_USER_ITERATIONS} + # hashWidth: ${SIMPLEWORKLIST_USER_HASH_WIDTH} + # secret: ${SIMPLEWORKLIST_USER_SECRET} + loginProcessingUrl: "/j_spring_security_check" + logoutUrl: "/user/logout" + cookieNamesToClear: + - "JSESSIONID" + invalidateHttpSession: true + defaultSuccessUrl: "/" + failureForwardUrl: "/user/login?login_error=1" + usernameParameter: "j_username" + passwordParameter: "j_password" + loginPage: "/user/login" + antPatternsPublic: + - "/webjars/**" + - "/css/**" + - "/img/**" + - "/js/**" + - "/favicon.ico" + - "/user/login*" + - "/user/register*" + - "/user/register/**" + - "/user/register/confirm/**" + - "/user/resetPassword*" + - "/user/resetPassword/**" + - "/user/resetPassword/confirm/**" + - "/error*" logging: level: root: INFO @@ -158,7 +159,8 @@ logging: ch: qos: WARN woehlke: - simpleworklist: INFO + java: + simpleworklist: INFO --- spring: datasource: @@ -178,4 +180,5 @@ logging: qos: WARN postgresql: WARN woehlke: - simpleworklist: INFO + java: + simpleworklist: INFO