Spring-Framework-Java-Apps · thomaswoehlke · Aug 26, 2022 · Aug 26, 2022 · Aug 26, 2022 · Aug 26, 2022
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.woehlke</groupId>
   <artifactId>simpleworklist</artifactId>
-  <version>2.3.62-SNAPSHOT</version>
+  <version>2.3.62</version>
   <packaging>jar</packaging>
 
   <parent>
@@ -17,7 +17,7 @@
     <connection>scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git</connection>
     <developerConnection>scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git</developerConnection>
     <url>https://github.com/Spring-Framework-Java-Apps/simpleworklist/tree/${project.scm.tag}</url>
-    <tag>head</tag>
+    <tag>v2.3.62</tag>
   </scm>
 
   <name>simpleworklist</name>
@@ -125,7 +125,7 @@
     <version.asciidoctor-maven-plugin>2.2.2</version.asciidoctor-maven-plugin>
     <version.doxia-module-markdown>1.11.1</version.doxia-module-markdown>
     <version.maven-enforcer-plugin>3.1.0</version.maven-enforcer-plugin>
-    <version.plantuml-maven-plugin>1.5.2</version.plantuml-maven-plugin>
+    <version.plantuml-maven-plugin>1.4.0</version.plantuml-maven-plugin>
     <version.net.sourceforge.plantuml>1.2022.6</version.net.sourceforge.plantuml>
   </properties>
 
@@ -1513,7 +1513,7 @@
               <goal>tree</goal>
             </goals>
           </execution>
-          -->
+
           <execution>
             <id>report</id>
             <phase>site</phase>
@@ -1535,7 +1535,7 @@
               </reportSets>
             </configuration>
           </execution>
-          <!--
+
           <execution>
             <id>get-dependency-sources</id>
             <phase>site</phase>
@@ -1558,13 +1558,15 @@
           <execution>
             <id>copy-dependencies</id>
             <phase>package</phase>
-            <goals><goal>copy-dependencies</goal></goals>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
             <configuration>
               <includeScope>compile</includeScope>
-              <excludeTypes>pom, maven-plugin</excludeTypes>
+              <excludeTypes>maven-plugin</excludeTypes>
               <excludeScope>test,provided</excludeScope>
-              <excludeGroupIds>antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby</excludeGroupIds>
-              <excludeArtifactIds>weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api</excludeArtifactIds>
+              <excludeGroupIds>antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby,com.vladsch.flexmark,org.apache.maven.doxia,org.codehaus.plexus,org.apache.maven.scm,io.netty,org.apache.groovy,org.eclipse.jetty,org.mockito,org.asciidoctor,com.github.jnr,org.apache.maven.surefire,net.sourceforge.saxon,net.sf.saxon,com.github.spotbugs,org.eclipse.jgit</excludeGroupIds>
+              <excludeArtifactIds>weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api,lombok,jcommander</excludeArtifactIds>
             </configuration>
           </execution>
         </executions>
@@ -1863,7 +1865,7 @@
   <profiles>
 
       <profile>
-      <id>war</id>
+      <id>jar</id>
       <properties>
         <skip.unit.tests>false</skip.unit.tests>
         <skip.integration.tests>true</skip.integration.tests>

diff --git a/src/main/resources/static/css/main.css b/src/main/resources/static/css/main.css
@@ -21,7 +21,7 @@ tt, th, code, kbd, samp, pre {
   font-family: 'Varela Round', sans-serif;
 }
 
-.jumbotron {
+header {
   border-radius: 0 !important;
 }
 

diff --git a/src/main/resources/static/img/jumbotron/berlin_skyline.png b/src/main/resources/static/img/jumbotron/berlin_skyline.png
diff --git a/src/main/resources/static/img/jumbotron/brandenburger_gate.png b/src/main/resources/static/img/jumbotron/brandenburger_gate.png
diff --git a/src/main/resources/static/img/jumbotron/oberbaumbridge.png b/src/main/resources/static/img/jumbotron/oberbaumbridge.png
diff --git a/src/main/resources/templates/layout/breadcrumb.html b/src/main/resources/templates/layout/breadcrumb.html
@@ -8,13 +8,13 @@
       <section class="container" sec:authorize="isAuthenticated()" th:if="${breadcrumb != null}">
 
             <nav aria-label="breadcrumb">
-                <ol class="breadcrumb">
+                <ol class="breadcrumb text-dark">
                     <li th:each="bc,iterStat : ${breadcrumb.getBreadcrumb()}"
                         th:class="${iterStat == breadcrumb.size()-1 ? 'breadcrumb-item active' : 'breadcrumb-item'}">
                         <span th:if="${iterStat == breadcrumb.size()-1}" th:text="${bc.name}"></span>
                         <a th:if="${iterStat != breadcrumb.size()-1}"
                            th:href="@{{url}(url=${bc.url})}"
-                           th:text="${bc.name}">
+                           th:text="${bc.name}" class="link-dark">
                         </a>
                     </li>
                 </ol>

diff --git a/src/main/resources/templates/layout/page.html b/src/main/resources/templates/layout/page.html
@@ -23,24 +23,23 @@
 <body th:fragment="tw-page-body(twcontent,twtitle,scripts)">
 
 	<!-- Navbar on Top -->
-	<header>
-		<div th:replace="layout/navbartop :: navbartop(contexts=${contexts},locale=${locale},thisProject=${thisProject},numberOfNewIncomingMessages=${numberOfNewIncomingMessages},ctx=${ctx})" >
-		</div>
-		<div class="jumbotron mt-3" id="tw-title-section">
-			<div class="container">
-				<th:block th:replace="${twtitle}" />
-			</div>
-		</div>
-	</header>
-
-  <!-- Breadcrumb -->
-  <div th:replace="layout/breadcrumb :: breadcrumb(breadcrumb=${breadcrumb})">
-  </div>
-
-  <!-- taskstates -->
-	<section th:replace="layout/taskstates :: navigation-taskstates(rootProjects=${rootProjects},thisProject=${thisProject})">
-	</section>
-
+	<header style="background-image: url('/img/jumbotron/2012-06-07_20.58.02.png')" >
+    <div style="background-color:  rgba(255, 255, 255, 0.3)">
+		  <div th:replace="layout/navbartop :: navbartop(contexts=${contexts},locale=${locale},thisProject=${thisProject},numberOfNewIncomingMessages=${numberOfNewIncomingMessages},ctx=${ctx})">
+      </div>
+      <div class="jumbotron pt-3" id="tw-title-section" >
+        <div class="container">
+          <th:block th:replace="${twtitle}" />
+        </div>
+      </div>
+      <!-- Breadcrumb -->
+      <div th:replace="layout/breadcrumb :: breadcrumb(breadcrumb=${breadcrumb})">
+      </div>
+      <!-- taskstates -->
+      <div th:replace="layout/taskstates :: navigation-taskstates(rootProjects=${rootProjects},thisProject=${thisProject})" class="link-dark">
+      </div>
+    </div>
+  </header>
 
 	<!-- Menu on Left Column and Document Window on the Right Column -->
 	<section id="tw-main-section">
@@ -143,7 +142,7 @@
 		function drop2completed(ev) {
 			ev.preventDefault();
 			var taskId = ev.dataTransfer.getData("task").split("_")[1];
-			var myUrl = '[(@{/taskstate/task/})]'+taskId+'/move/to/completed';
+			var myUrl = '[(@{/taskstate/task/})]'+taskId+'/move/to/taskstate/completed';
 			window.location.replace(myUrl);
 		}
 

diff --git a/src/main/resources/templates/layout/taskstates.html b/src/main/resources/templates/layout/taskstates.html
@@ -5,69 +5,132 @@
       xmlns:sd="http://www.thymeleaf.org/spring-data">
 
     <section th:fragment="navigation-taskstates(rootProjects,thisProject)">
-        <div class="container mb-3" id="taskStateNavigationContainer" sec:authorize="isAuthenticated()">
+        <div class="container mb-3 text-dark" id="taskStateNavigationContainer" sec:authorize="isAuthenticated()">
             <ul id="taskStateNavigation" class="nav nav-tabs">
                 <li class="nav-item" ondrop="drop2inbox(event)" ondragover="allowDropOfTask(event)">
-                    <a id="taskstate_inbox" th:href="@{/taskstate/inbox}"
-                       th:class="${taskstateType == null or taskstateType == 'inbox' ? 'nav-link active' : 'nav-link'}">
-                        <i class="fas fa-inbox"></i>
-                        <span th:text="#{layout.page.inbox}">Inbox</span>
+                    <a id="taskstate_inbox" class="nav-link active link-dark"
+                       th:href="@{/taskstate/inbox}"
+                       th:if="${taskstateType == 'inbox'}">
+                        <i class="fas fa-inbox link-dark"></i>
+                        <span th:text="#{layout.page.inbox}" class="link-dark">Inbox</span>
+                    </a>
+                    <a id="taskstate_inbox" class="nav-link link-light"
+                       th:href="@{/taskstate/inbox}"
+                       th:if="${taskstateType != 'inbox'}">
+                      <i class="fas fa-inbox link-light"></i>
+                      <span th:text="#{layout.page.inbox}" class="link-light">Inbox</span>
                     </a>
                 </li>
                 <li class="nav-item" ondrop="drop2today(event)" ondragover="allowDropOfTask(event)">
-                    <a id="taskstate_today" th:href="@{/taskstate/today}"
-                       th:class="${taskstateType == 'today' ? 'nav-link active' : 'nav-link'}">
-                        <i class="fas fa-clock"></i>
-                        <span th:text="#{layout.page.today}">Today</span>
+                    <a id="taskstate_today" class="nav-link active link-dark"
+                       th:href="@{/taskstate/today}"
+                       th:if="${taskstateType == 'today'}">
+                        <i class="fas fa-clock link-dark"></i>
+                        <span th:text="#{layout.page.today}" class="link-dark">Today</span>
+                    </a>
+                    <a id="taskstate_today" class="nav-link link-light"
+                       th:href="@{/taskstate/today}"
+                       th:if="${taskstateType != 'today'}">
+                      <i class="fas fa-clock link-light"></i>
+                      <span th:text="#{layout.page.today}" class="link-light">Today</span>
                     </a>
                 </li>
                 <li class="nav-item" ondrop="drop2next(event)" ondragover="allowDropOfTask(event)">
-                    <a id="taskstate_next" th:href="@{/taskstate/next}"
-                       th:class="${taskstateType == 'next' ? 'nav-link active' : 'nav-link'}">
+                    <a id="taskstate_next" class="nav-link active link-dark"
+                       th:href="@{/taskstate/next}"
+                       th:if="${taskstateType == 'next'}">
                         <i class="fas fa-cogs"></i>
                         <span th:text="#{layout.page.next}">Next</span>
                     </a>
+                    <a id="taskstate_next"  class="nav-link link-light"
+                       th:href="@{/taskstate/next}"
+                       th:if="${taskstateType != 'next'}">
+                      <i class="fas fa-cogs"></i>
+                      <span th:text="#{layout.page.next}">Next</span>
+                    </a>
                 </li>
                 <li class="nav-item" ondrop="drop2waiting(event)" ondragover="allowDropOfTask(event)">
-                    <a id="taskstate_waiting" th:href="@{/taskstate/waiting}"
-                       th:class="${taskstateType == 'waiting' ? 'nav-link active' : 'nav-link'}">
+                    <a id="taskstate_waiting" class="nav-link active link-dark"
+                       th:href="@{/taskstate/waiting}"
+                       th:if="${taskstateType == 'waiting'}">
                         <i class="fas fa-hourglass-half"></i>
                         <span th:text="#{layout.page.waiting}">Waiting</span>
                     </a>
+                    <a id="taskstate_waiting"  class="nav-link link-light"
+                       th:href="@{/taskstate/waiting}"
+                       th:if="${taskstateType != 'waiting'}">
+                      <i class="fas fa-hourglass-half"></i>
+                      <span th:text="#{layout.page.waiting}">Waiting</span>
+                    </a>
                 </li>
                 <li class="nav-item">
-                    <a id="taskstate_scheduled" th:href="@{/taskstate/scheduled}"
-                       th:class="${taskstateType == 'scheduled' ? 'nav-link active' : 'nav-link'}">
+                    <a id="taskstate_scheduled" class="nav-link active link-dark"
+                       th:href="@{/taskstate/scheduled}"
+                       th:if="${taskstateType == 'scheduled'}">
                         <i class="fas fa-calendar-alt"></i>
                         <span th:text="#{layout.page.scheduled}">Scheduled</span>
                     </a>
+                    <a id="taskstate_scheduled" class="nav-link link-light"
+                       th:href="@{/taskstate/scheduled}"
+                       th:if="${taskstateType != 'scheduled'}">
+                      <i class="fas fa-calendar-alt"></i>
+                      <span th:text="#{layout.page.scheduled}">Scheduled</span>
+                    </a>
                 </li>
                 <li class="nav-item" ondrop="drop2someday(event)" ondragover="allowDropOfTask(event)">
-                    <a id="taskstate_someday" th:href="@{/taskstate/someday}"
-                       th:class="${taskstateType == 'someday' ? 'nav-link active' : 'nav-link'}">
+                    <a id="taskstate_someday" class="nav-link active link-dark"
+                       th:href="@{/taskstate/someday}"
+                       th:if="${taskstateType == 'someday'}">
                         <i class="fas fa-road"></i>
                         <span th:text="#{layout.page.someday}">Someday</span>
                     </a>
+                    <a id="taskstate_someday" class="nav-link link-light"
+                       th:href="@{/taskstate/someday}"
+                       th:if="${taskstateType != 'someday'}">
+                      <i class="fas fa-road"></i>
+                      <span th:text="#{layout.page.someday}">Someday</span>
+                    </a>
                 </li>
                 <li class="nav-item" ondrop="drop2focus(event)" ondragover="allowDropOfTask(event)">
-                    <a id="taskstate_focus" th:href="@{/taskstate/focus}"
-                       th:class="${taskstateType == 'focus' ? 'nav-link active' : 'nav-link'}">
+                    <a id="taskstate_focus" class="nav-link active link-dark"
+                       th:href="@{/taskstate/focus}"
+                       th:if="${taskstateType == 'focus'}">
                         <i class="fas fa-star"></i>
                         <span th:text="#{layout.page.focus}">Focus</span>
                     </a>
+                    <a id="taskstate_focus" class="nav-link link-light"
+                       th:href="@{/taskstate/focus}"
+                       th:if="${taskstateType != 'focus'}">
+                      <i class="fas fa-star"></i>
+                      <span th:text="#{layout.page.focus}">Focus</span>
+                    </a>
                 </li>
                 <li class="nav-item" ondrop="drop2completed(event)" ondragover="allowDropOfTask(event)">
-                    <a id="taskstate_completed" th:href="@{/taskstate/completed}"
-                       th:class="${taskstateType == 'completed' ? 'nav-link active' : 'nav-link'}">
+                    <a id="taskstate_completed" class="nav-link active link-dark"
+                       th:href="@{/taskstate/completed}"
+                       th:if="${taskstateType == 'completed'}">
                         <i class="fas fa-check-square"></i>
                         <span th:text="#{layout.page.completed}">Completed Tasks</span>
                     </a>
+                    <a id="taskstate_completed" class="nav-link link-light"
+                       th:href="@{/taskstate/completed}"
+                       th:if="${taskstateType != 'completed'}">
+                      <i class="fas fa-check-square"></i>
+                      <span th:text="#{layout.page.completed}">Completed Tasks</span>
+                    </a>
                 </li>
                 <li class="nav-item" ondrop="drop2trash(event)" ondragover="allowDropOfTask(event)">
-                    <a id="taskstate_trash" th:href="@{/taskstate/trash}"
-                       th:class="${taskstateType == 'trash' ? 'nav-link active' : 'nav-link'}">
-                        <i class="fas fa-trash-alt"></i>
-                        <span th:text="#{layout.page.trash}">Trash</span>
+                    <a id="taskstate_trash" class="nav-link active link-dark"
+                       th:href="@{/taskstate/trash}"
+                       th:if="${taskstateType == 'trash'}">
+                        <i class="fas fa-trash-alt link-dark"></i>
+                        <span th:text="#{layout.page.trash}" class="link-dark">Trash</span>
+                    </a>
+                    <a id="taskstate_trash" class="nav-link link-light"
+                       th:href="@{/taskstate/trash}"
+                       th:if="${taskstateType != 'trash'}">
+                      <i class="fas fa-trash-alt link-light"></i>
+                      <span th:text="#{layout.page.trash}" class="link-light">Trash</span>
                     </a>
                 </li>
             </ul>

diff --git a/.../java/simpleworklist/test/SmokeTests.java → ...ehlke/java/simpleworklist/SmokeTests.java b/.../java/simpleworklist/test/SmokeTests.java → ...ehlke/java/simpleworklist/SmokeTests.java
@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.test;
+package org.woehlke.java.simpleworklist;
 
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.*;
@@ -14,9 +14,7 @@
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.ResultActions;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
-import org.woehlke.java.simpleworklist.SimpleworklistApplication;
-import org.woehlke.java.simpleworklist.test.application.config.FunctionalRequirements;
-import org.woehlke.java.simpleworklist.test.application.config.UserAccountTestDataService;
+import org.woehlke.java.simpleworklist.config.UserAccountTestDataService;
 
 import java.net.URL;
 
@@ -26,7 +24,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.java.simpleworklist.test.application.config.Requirements.*;
+import static org.woehlke.java.simpleworklist.config.Requirements.*;
 
 @Slf4j
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)

diff --git a/...application/helper/TestHelperService.java → ...application/helper/TestHelperService.java b/...application/helper/TestHelperService.java → ...application/helper/TestHelperService.java
@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.test.application.helper;
+package org.woehlke.java.simpleworklist.application.helper;
 
 import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserPasswordRecovery;
 import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistration;

diff --git a/...ication/helper/TestHelperServiceImpl.java → ...ication/helper/TestHelperServiceImpl.java b/...ication/helper/TestHelperServiceImpl.java → ...ication/helper/TestHelperServiceImpl.java
@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.test.application.helper;
+package org.woehlke.java.simpleworklist.application.helper;
 
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;

diff --git a/...test/application/config/AbstractTest.java → ...a/simpleworklist/config/AbstractTest.java b/...test/application/config/AbstractTest.java → ...a/simpleworklist/config/AbstractTest.java
@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.test.application.config;
+package org.woehlke.java.simpleworklist.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -7,7 +7,7 @@
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.context.WebApplicationContext;
-import org.woehlke.java.simpleworklist.test.application.helper.TestHelperService;
+import org.woehlke.java.simpleworklist.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;

diff --git a/...cation/config/FunctionalRequirements.java → ...rklist/config/FunctionalRequirements.java b/...cation/config/FunctionalRequirements.java → ...rklist/config/FunctionalRequirements.java
@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.test.application.config;
+package org.woehlke.java.simpleworklist.config;
 
 public enum FunctionalRequirements {
 

diff --git a/...test/application/config/Requirements.java → ...a/simpleworklist/config/Requirements.java b/...test/application/config/Requirements.java → ...a/simpleworklist/config/Requirements.java
@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.test.application.config;
+package org.woehlke.java.simpleworklist.config;
 
 public interface Requirements {
 

diff --git a/...on/config/UserAccountTestDataService.java → ...st/config/UserAccountTestDataService.java b/...on/config/UserAccountTestDataService.java → ...st/config/UserAccountTestDataService.java
@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.test.application.config;
+package org.woehlke.java.simpleworklist.config;
 
 import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
 

diff --git a/...onfig/UserAccountTestDataServiceImpl.java → ...onfig/UserAccountTestDataServiceImpl.java b/...onfig/UserAccountTestDataServiceImpl.java → ...onfig/UserAccountTestDataServiceImpl.java
@@ -1,10 +1,9 @@
-package org.woehlke.java.simpleworklist.test.application.config;
+package org.woehlke.java.simpleworklist.config;
 
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-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;

diff --git a/...test/java/org/woehlke/java/simpleworklist/domain/chat/User2UserMessageControllerTest.java b/...test/java/org/woehlke/java/simpleworklist/domain/chat/User2UserMessageControllerTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.java.simpleworklist.domain.chat;
+
+public class User2UserMessageControllerTest {
+}