Skip to content

Commit 9c1c88c

Browse files
thomaswoehlkethomaswoehlke
authored
Merge pull request #350 from Spring-Framework-Java-Apps/master
deployment
2 parents f57915b + f4168b0 commit 9c1c88c

34 files changed

+157
-274
lines changed

‎pom.xml

Lines changed: 11 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>org.woehlke</groupId>
66
<artifactId>simpleworklist</artifactId>
7-
<version>2.3.58-SNAPSHOT</version>
7+
<version>2.3.61-SNAPSHOT</version>
88
<packaging>jar</packaging>
99

1010
<parent>
@@ -1259,58 +1259,6 @@
12591259
<groupId>org.apache.maven.plugins</groupId>
12601260
<artifactId>maven-site-plugin</artifactId>
12611261
<version>${version.maven-site-plugin}</version>
1262-
<!--
1263-
<dependencies>
1264-
<dependency>
1265-
<groupId>org.apache.maven.doxia</groupId>
1266-
<artifactId>doxia-module-markdown</artifactId>
1267-
<version>${doxia-module.version}</version>
1268-
<scope>compile</scope>
1269-
</dependency>
1270-
<dependency>
1271-
<groupId>org.apache.maven.doxia</groupId>
1272-
<artifactId>doxia-module-itext</artifactId>
1273-
<version>${doxia-module.version}</version>
1274-
<scope>compile</scope>
1275-
</dependency>
1276-
<dependency>
1277-
<groupId>org.apache.maven.doxia</groupId>
1278-
<artifactId>doxia-module-latex</artifactId>
1279-
<version>${doxia-module.version}</version>
1280-
<scope>compile</scope>
1281-
</dependency>
1282-
<dependency>
1283-
<groupId>org.apache.maven.doxia</groupId>
1284-
<artifactId>doxia-module-rtf</artifactId>
1285-
<version>${doxia-module.version}</version>
1286-
<scope>compile</scope>
1287-
</dependency>
1288-
<dependency>
1289-
<groupId>org.apache.maven.doxia</groupId>
1290-
<artifactId>doxia-module-xdoc</artifactId>
1291-
<version>${doxia-module.version}</version>
1292-
<scope>compile</scope>
1293-
</dependency>
1294-
<dependency>
1295-
<groupId>org.apache.maven.doxia</groupId>
1296-
<artifactId>doxia-skin-model</artifactId>
1297-
<version>${doxia-module.version}</version>
1298-
<scope>compile</scope>
1299-
</dependency>
1300-
<dependency>
1301-
<groupId>org.apache.maven.doxia</groupId>
1302-
<artifactId>doxia-site-renderer</artifactId>
1303-
<version>${doxia-module.version}</version>
1304-
<scope>compile</scope>
1305-
</dependency>
1306-
<dependency>
1307-
<groupId>org.apache.maven.doxia</groupId>
1308-
<artifactId>doxia-test-docs</artifactId>
1309-
<version>${doxia-module.version}</version>
1310-
<scope>compile</scope>
1311-
</dependency>
1312-
</dependencies>
1313-
-->
13141262
</plugin>
13151263
<plugin>
13161264
<groupId>org.apache.maven.plugins</groupId>
@@ -1457,6 +1405,7 @@
14571405
<groupId>org.apache.maven.plugins</groupId>
14581406
<artifactId>maven-dependency-plugin</artifactId>
14591407
<executions>
1408+
<!--
14601409
<execution>
14611410
<id>unpack-dependency-classes-install</id>
14621411
<phase>pre-site</phase>
@@ -1564,6 +1513,7 @@
15641513
<goal>tree</goal>
15651514
</goals>
15661515
</execution>
1516+
-->
15671517
<execution>
15681518
<id>report</id>
15691519
<phase>site</phase>
@@ -1611,6 +1561,14 @@
16111561
-->
16121562
</configuration>
16131563
</execution>
1564+
<execution>
1565+
<id>copy-dependencies</id>
1566+
<phase>package</phase>
1567+
<goals><goal>copy-dependencies</goal></goals>
1568+
<configuration>
1569+
<includeScope>compile</includeScope>
1570+
</configuration>
1571+
</execution>
16141572
</executions>
16151573
</plugin>
16161574
<plugin>

‎src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageController.java renamed to ‎src/main/java/org/woehlke/java/simpleworklist/domain/ChatMessageController.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.java.simpleworklist.domain.chat;
1+
package org.woehlke.java.simpleworklist.domain;
22

33
import lombok.extern.slf4j.Slf4j;
44
import org.springframework.data.domain.Page;
@@ -15,6 +15,8 @@
1515
import org.springframework.web.bind.annotation.RequestMethod;
1616
import org.woehlke.java.simpleworklist.application.framework.AbstractController;
1717
import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb;
18+
import org.woehlke.java.simpleworklist.domain.chat.ChatMessage;
19+
import org.woehlke.java.simpleworklist.domain.chat.ChatMessageForm;
1820
import org.woehlke.java.simpleworklist.domain.context.Context;
1921
import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
2022
import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;

‎src/main/java/org/woehlke/java/simpleworklist/domain/context/ContextController.java renamed to ‎src/main/java/org/woehlke/java/simpleworklist/domain/ContextController.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.java.simpleworklist.domain.context;
1+
package org.woehlke.java.simpleworklist.domain;
22

33
import lombok.extern.slf4j.Slf4j;
44
import org.springframework.stereotype.Controller;
@@ -8,6 +8,8 @@
88
import org.springframework.web.bind.annotation.RequestMapping;
99
import org.springframework.web.bind.annotation.RequestMethod;
1010
import org.woehlke.java.simpleworklist.application.framework.AbstractController;
11+
import org.woehlke.java.simpleworklist.domain.context.Context;
12+
import org.woehlke.java.simpleworklist.domain.context.ContextService;
1113
import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
1214

1315
import org.springframework.beans.factory.annotation.Autowired;

‎src/main/java/org/woehlke/java/simpleworklist/domain/PagesController.java

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package org.woehlke.java.simpleworklist.domain;
2+
3+
import lombok.extern.slf4j.Slf4j;
4+
import org.springframework.stereotype.Controller;
5+
import org.springframework.ui.Model;
6+
import org.springframework.web.bind.annotation.ModelAttribute;
7+
import org.springframework.web.bind.annotation.RequestMapping;
8+
import org.springframework.web.bind.annotation.RequestMethod;
9+
import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
10+
11+
import javax.validation.constraints.NotNull;
12+
import java.util.Locale;
13+
14+
@Slf4j
15+
@Controller
16+
@RequestMapping(path = "/")
17+
public class PagesController {
18+
19+
20+
@RequestMapping(path = "/information", method = RequestMethod.GET)
21+
public final String renderPageInformation(
22+
@NotNull @ModelAttribute("userSession") UserSessionBean userSession,
23+
Locale locale, Model model
24+
) {
25+
log.info("addNewTaskToInboxGet");
26+
return "pages/information";
27+
}
28+
}

‎src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectIdController.java renamed to ‎src/main/java/org/woehlke/java/simpleworklist/domain/ProjectIdController.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.java.simpleworklist.domain.project;
1+
package org.woehlke.java.simpleworklist.domain;
22

33
import lombok.extern.slf4j.Slf4j;
44
import org.springframework.data.domain.Page;
@@ -14,6 +14,8 @@
1414
import org.woehlke.java.simpleworklist.application.framework.AbstractController;
1515
import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb;
1616
import org.woehlke.java.simpleworklist.domain.context.Context;
17+
import org.woehlke.java.simpleworklist.domain.project.Project;
18+
import org.woehlke.java.simpleworklist.domain.project.ProjectControllerService;
1719
import org.woehlke.java.simpleworklist.domain.task.Task;
1820
import org.woehlke.java.simpleworklist.domain.task.TaskEnergy;
1921
import org.woehlke.java.simpleworklist.domain.task.TaskService;

‎src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectRootController.java renamed to ‎src/main/java/org/woehlke/java/simpleworklist/domain/ProjectRootController.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.java.simpleworklist.domain.project;
1+
package org.woehlke.java.simpleworklist.domain;
22

33
import lombok.extern.slf4j.Slf4j;
44
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +14,8 @@
1414
import org.springframework.web.bind.annotation.*;
1515
import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb;
1616
import org.woehlke.java.simpleworklist.domain.context.Context;
17+
import org.woehlke.java.simpleworklist.domain.project.Project;
18+
import org.woehlke.java.simpleworklist.domain.project.ProjectControllerService;
1719
import org.woehlke.java.simpleworklist.domain.task.Task;
1820
import org.woehlke.java.simpleworklist.domain.task.TaskEnergy;
1921
import org.woehlke.java.simpleworklist.domain.task.TaskService;

‎src/main/java/org/woehlke/java/simpleworklist/domain/search/SearchController.java renamed to ‎src/main/java/org/woehlke/java/simpleworklist/domain/SearchController.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.java.simpleworklist.domain.search;
1+
package org.woehlke.java.simpleworklist.domain;
22

33
import lombok.extern.slf4j.Slf4j;
44
import org.springframework.stereotype.Controller;
@@ -9,6 +9,7 @@
99
import org.springframework.web.bind.annotation.RequestParam;
1010
import org.woehlke.java.simpleworklist.application.framework.AbstractController;
1111
import org.woehlke.java.simpleworklist.domain.context.Context;
12+
import org.woehlke.java.simpleworklist.domain.search.SearchService;
1213
import org.woehlke.java.simpleworklist.domain.search.result.SearchResult;
1314
import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb;
1415
import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;

‎src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskStateTabController.java renamed to ‎src/main/java/org/woehlke/java/simpleworklist/domain/TaskStateTabController.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.java.simpleworklist.domain.taskworkflow;
1+
package org.woehlke.java.simpleworklist.domain;
22

33
import org.springframework.beans.factory.annotation.Autowired;
44
import org.springframework.data.domain.Pageable;
@@ -14,6 +14,9 @@
1414
import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
1515

1616
import lombok.extern.slf4j.Slf4j;
17+
import org.woehlke.java.simpleworklist.domain.taskworkflow.MoveTaskToTaskInTaskstateService;
18+
import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState;
19+
1720
import javax.validation.constraints.NotNull;
1821
import java.util.Locale;
1922

‎src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskStateTaskController.java renamed to ‎src/main/java/org/woehlke/java/simpleworklist/domain/TaskStateTaskController.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.java.simpleworklist.domain.taskworkflow;
1+
package org.woehlke.java.simpleworklist.domain;
22

33

44
import org.springframework.stereotype.Controller;
@@ -14,6 +14,9 @@
1414
import org.woehlke.java.simpleworklist.domain.task.TaskEnergy;
1515
import org.woehlke.java.simpleworklist.domain.task.TaskService;
1616
import org.woehlke.java.simpleworklist.domain.task.TaskTime;
17+
import org.woehlke.java.simpleworklist.domain.taskworkflow.MoveTaskToTaskInTaskstateService;
18+
import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState;
19+
import org.woehlke.java.simpleworklist.domain.taskworkflow.TransformTaskIntoProjektService;
1720
import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
1821
import org.woehlke.java.simpleworklist.application.framework.AbstractController;
1922
import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;

‎src/main/java/org/woehlke/java/simpleworklist/domain/testdata/TestDataController.java renamed to ‎src/main/java/org/woehlke/java/simpleworklist/domain/TestDataController.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
package org.woehlke.java.simpleworklist.domain.testdata;
1+
package org.woehlke.java.simpleworklist.domain;
22

33
import lombok.extern.slf4j.Slf4j;
44
import org.springframework.stereotype.Controller;
55
import org.springframework.web.bind.annotation.RequestMapping;
66
import org.springframework.web.bind.annotation.RequestMethod;
7+
import org.woehlke.java.simpleworklist.domain.testdata.TestDataService;
78
import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
89

910
import org.springframework.beans.factory.annotation.Autowired;

‎src/main/java/org/woehlke/java/simpleworklist/domain/user/login/UserLoginController.java renamed to ‎src/main/java/org/woehlke/java/simpleworklist/domain/UserLoginController.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.java.simpleworklist.domain.user.login;
1+
package org.woehlke.java.simpleworklist.domain;
22

33
import lombok.extern.slf4j.Slf4j;
44
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +18,8 @@
1818
import org.springframework.web.bind.support.SessionStatus;
1919
import org.woehlke.java.simpleworklist.domain.user.access.UserAuthorizationService;
2020
import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
21+
import org.woehlke.java.simpleworklist.domain.user.login.LoginForm;
22+
import org.woehlke.java.simpleworklist.domain.user.login.UserAccountLoginSuccessService;
2123

2224
@Slf4j
2325
@Controller

‎src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryController.java renamed to ‎src/main/java/org/woehlke/java/simpleworklist/domain/UserPasswordRecoveryController.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.java.simpleworklist.domain.user.passwordrecovery;
1+
package org.woehlke.java.simpleworklist.domain;
22

33
import lombok.extern.slf4j.Slf4j;
44
import org.springframework.stereotype.Controller;
@@ -11,6 +11,8 @@
1111
import org.woehlke.java.simpleworklist.domain.user.account.UserAccountService;
1212
import org.woehlke.java.simpleworklist.domain.user.account.UserAccountForm;
1313
import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
14+
import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserPasswordRecovery;
15+
import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserPasswordRecoveryService;
1416
import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistrationForm;
1517

1618
import org.springframework.beans.factory.annotation.Autowired;

‎src/main/java/org/woehlke/java/simpleworklist/domain/user/signup/UserRegistrationController.java renamed to ‎src/main/java/org/woehlke/java/simpleworklist/domain/UserRegistrationController.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.java.simpleworklist.domain.user.signup;
1+
package org.woehlke.java.simpleworklist.domain;
22

33
import lombok.extern.slf4j.Slf4j;
44
import org.springframework.beans.factory.annotation.Autowired;
@@ -11,6 +11,9 @@
1111
import org.springframework.web.bind.annotation.RequestMethod;
1212
import org.woehlke.java.simpleworklist.domain.user.account.UserAccountService;
1313
import org.woehlke.java.simpleworklist.domain.user.account.UserAccountForm;
14+
import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistration;
15+
import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistrationForm;
16+
import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistrationService;
1417

1518
import javax.validation.Valid;
1619

‎src/main/java/org/woehlke/java/simpleworklist/domain/user/accountselfservice/UserSelfserviceController.java renamed to ‎src/main/java/org/woehlke/java/simpleworklist/domain/UserSelfserviceController.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.java.simpleworklist.domain.user.accountselfservice;
1+
package org.woehlke.java.simpleworklist.domain;
22

33
import lombok.extern.slf4j.Slf4j;
44
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +24,9 @@
2424
import org.woehlke.java.simpleworklist.domain.context.Context;
2525
import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
2626
import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
27+
import org.woehlke.java.simpleworklist.domain.user.accountselfservice.UserChangeDefaultContextForm;
28+
import org.woehlke.java.simpleworklist.domain.user.accountselfservice.UserChangeNameForm;
29+
import org.woehlke.java.simpleworklist.domain.user.accountselfservice.UserChangePasswordForm;
2730

2831
import javax.validation.Valid;
2932
import java.util.List;

‎src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbService.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import org.woehlke.java.simpleworklist.domain.context.Context;
44
import org.woehlke.java.simpleworklist.domain.project.Project;
5-
import org.woehlke.java.simpleworklist.domain.task.Task;
65
import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState;
76
import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
87

@@ -16,12 +15,6 @@ public interface BreadcrumbService {
1615

1716
Breadcrumb getBreadcrumbForTaskstate(TaskState taskstate, Locale locale, UserSessionBean userSession);
1817

19-
Breadcrumb getBreadcrumbForTaskstateAll(Locale locale, UserSessionBean userSession);
20-
21-
Breadcrumb getBreadcrumbForTaskInTaskstate(String taskstate, Task task, Locale locale, UserSessionBean userSession);
22-
23-
Breadcrumb getBreadcrumbForTaskInProject(Project thisProject, Task task, Locale local, UserSessionBean userSession);
24-
2518
Breadcrumb getBreadcrumbForUserProfileAndMenu(Locale locale,UserSessionBean userSession);
2619

2720
Breadcrumb getBreadcrumbForUserChangeName(Locale locale, UserSessionBean userSession);

‎src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbServiceImpl.java

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -85,37 +85,6 @@ public Breadcrumb getBreadcrumbForTaskstate(
8585
return breadcrumb;
8686
}
8787

88-
@Override
89-
public Breadcrumb getBreadcrumbForTaskInTaskstate(String taskstate, Task task, Locale locale, UserSessionBean userSession) {
90-
log.info("getBreadcrumbForTaskInTaskstate");
91-
Optional<Context> context = contextService.getContextFor(userSession);
92-
Breadcrumb breadcrumb = new Breadcrumb(locale, context.get());
93-
breadcrumb.addTaskstate(taskstate);
94-
breadcrumb.addTask(task);
95-
return breadcrumb;
96-
}
97-
98-
@Override
99-
public Breadcrumb getBreadcrumbForTaskstateAll(Locale locale, UserSessionBean userSession) {
100-
log.info("getBreadcrumbForTaskstateAll");
101-
Optional<Context> context = contextService.getContextFor(userSession);
102-
Breadcrumb breadcrumb = new Breadcrumb(locale, context.get());
103-
String code="layout.page.all";
104-
String name= messageSource.getMessage(code,null,locale);
105-
String url="/taskstate/all";
106-
breadcrumb.addPage(name,url);
107-
return breadcrumb;
108-
}
109-
110-
@Override
111-
public Breadcrumb getBreadcrumbForTaskInProject(Project thisProject, Task task, Locale locale, UserSessionBean userSession) {
112-
log.info("getBreadcrumbForTaskInProject");
113-
Breadcrumb breadcrumb = new Breadcrumb(locale,thisProject.getContext());
114-
breadcrumb.addProject(thisProject);
115-
breadcrumb.addTask(task);
116-
return breadcrumb;
117-
}
118-
11988
@Override
12089
public Breadcrumb getBreadcrumbForUserProfileAndMenu(Locale locale, UserSessionBean userSession) {
12190
log.info("getBreadcrumbForUserProfileAndMenu");

‎src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessage.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ public class ChatMessage extends AuditModel implements Serializable {
4747
)
4848
private Long id;
4949

50-
//@SafeHtml(whitelistType= SafeHtml.WhiteListType.SIMPLE_TEXT)
5150
@NotBlank
5251
@Length(min=1,max=65535)
5352
@Column(name="message_text", nullable = false, length = 65535, columnDefinition="text")

‎src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageForm.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
import lombok.*;
55
import org.hibernate.validator.constraints.Length;
6-
//import org.hibernate.validator.constraints.SafeHtml;
76

87
import javax.validation.constraints.NotBlank;
98
import java.io.Serializable;
@@ -18,7 +17,6 @@ public class ChatMessageForm implements Serializable {
1817

1918
private static final long serialVersionUID = 1576610181966480168L;
2019

21-
//@SafeHtml(whitelistType= SafeHtml.WhiteListType.SIMPLE_TEXT)
2220
@NotBlank
2321
@Length(min=1,max=65535)
2422
private String messageText;

0 commit comments

Comments
 (0)