Skip to content

Commit 4ec8b0f

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent ac7a5fc commit 4ec8b0f

File tree

58 files changed

+85
-96
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+85
-96
lines changed

‎etc/serialversions/serialversions.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ org.woehlke.simpleworklist.domain.task.TaskState: private static final long s
44
org.woehlke.simpleworklist.domain.task.TaskTime: private static final long serialVersionUID = 0L;
55
org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecoveryStatus: private static final long serialVersionUID = 0L;
66
org.woehlke.simpleworklist.user.register.UserRegistrationStatus: private static final long serialVersionUID = 0L;
7-
org.woehlke.simpleworklist.user.account.UserRole: private static final long serialVersionUID = 0L;
7+
org.woehlke.simpleworklist.user.domain.account.UserRole: private static final long serialVersionUID = 0L;
88
org.woehlke.simpleworklist.common.domain.AuditModel: private static final long serialVersionUID = 4399373914714726911L;
99
org.woehlke.simpleworklist.domain.context.Context: private static final long serialVersionUID = -5035732370606951871L;
1010
org.woehlke.simpleworklist.domain.project.Project: private static final long serialVersionUID = 4566653175832872422L;
1111
org.woehlke.simpleworklist.domain.task.Task: private static final long serialVersionUID = 5247710652586269801L;
1212
org.woehlke.simpleworklist.user.chat.User2UserMessage: private static final long serialVersionUID = 4263078228257938175L;
13-
org.woehlke.simpleworklist.user.account.UserAccount: private static final long serialVersionUID = 7860692526488291439L;
13+
org.woehlke.simpleworklist.user.domain.account.UserAccount: private static final long serialVersionUID = 7860692526488291439L;
1414
org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecovery: private static final long serialVersionUID = 6860716425733119940L;
1515
org.woehlke.simpleworklist.user.register.UserRegistration: private static final long serialVersionUID = -1955967514018161878L;
1616
org.woehlke.simpleworklist.domain.breadcrumb.BreadcrumbItem: private static final long serialVersionUID = 8276819198016077167L;
@@ -19,10 +19,10 @@ org.woehlke.simpleworklist.user.login.LoginForm: private static final long se
1919
org.woehlke.simpleworklist.domain.context.NewContextForm: private static final long serialVersionUID = -937143305653156981L;
2020
org.woehlke.simpleworklist.user.chat.User2UserMessageFormBean: private static final long serialVersionUID = 1576610181966480168L;
2121
org.woehlke.simpleworklist.searchRequest.SearchResult: private static final long serialVersionUID = 1682809351146047764L;
22-
org.woehlke.simpleworklist.user.account.UserAccountForm: private static final long serialVersionUID = 9180383385243540190L;
23-
org.woehlke.simpleworklist.user.account.UserChangeDefaultContextForm: private static final long serialVersionUID = -8592295563275083292L;
22+
org.woehlke.simpleworklist.user.domain.account.UserAccountForm: private static final long serialVersionUID = 9180383385243540190L;
23+
org.woehlke.simpleworklist.user.domain.account.UserChangeDefaultContextForm: private static final long serialVersionUID = -8592295563275083292L;
2424
org.woehlke.simpleworklist.common.language.UserChangeLanguageForm: private static final long serialVersionUID = 2201123162578113187L;
25-
org.woehlke.simpleworklist.user.account.UserChangeNameForm: private static final long serialVersionUID = 5120488382888268418L;
26-
org.woehlke.simpleworklist.user.account.UserChangePasswordForm: private static final long serialVersionUID = 9149342594823222054L;
25+
org.woehlke.simpleworklist.user.domain.account.UserChangeNameForm: private static final long serialVersionUID = 5120488382888268418L;
26+
org.woehlke.simpleworklist.user.domain.account.UserChangePasswordForm: private static final long serialVersionUID = 9149342594823222054L;
2727
org.woehlke.simpleworklist.user.register.UserRegistrationForm: private static final long serialVersionUID = 6864871862706880939L;
2828
org.woehlke.simpleworklist.user.session.UserSessionBean: private static final long serialVersionUID = -6649686058228455825L;

‎src/main/bash/getserialversionid.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ serialver org.woehlke.simpleworklist.context.UserChangeDefaultContextForm >> $SE
5353
serialver org.woehlke.simpleworklist.language.UserChangeLanguageForm >> $SERIALVERSIONS_FILE
5454
serialver org.woehlke.simpleworklist.user.selfservice.UserChangeNameForm >> $SERIALVERSIONS_FILE
5555
serialver org.woehlke.simpleworklist.user.selfservice.UserChangePasswordForm >> $SERIALVERSIONS_FILE
56-
#serialver org.woehlke.simpleworklist.user.account.UserDetailsBean >> $SERIALVERSIONS_FILE
56+
#serialver org.woehlke.simpleworklist.user.domain.account.UserDetailsBean >> $SERIALVERSIONS_FILE
5757
serialver org.woehlke.simpleworklist.user.register.UserRegistrationForm >> $SERIALVERSIONS_FILE
5858
serialver org.woehlke.simpleworklist.user.UserSessionBean >> $SERIALVERSIONS_FILE
5959
cd $PROJECT_PATH

‎src/main/java/org/woehlke/simpleworklist/common/domain/AbstractController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.woehlke.simpleworklist.domain.project.Project;
1111
import org.woehlke.simpleworklist.domain.task.TaskService;
1212
import org.woehlke.simpleworklist.domain.task.TaskState;
13-
import org.woehlke.simpleworklist.user.account.UserAccount;
13+
import org.woehlke.simpleworklist.user.domain.account.UserAccount;
1414
import org.woehlke.simpleworklist.domain.task.TaskEnergy;
1515
import org.woehlke.simpleworklist.domain.task.TaskTime;
1616
import org.woehlke.simpleworklist.domain.context.ContextService;

‎src/main/java/org/woehlke/simpleworklist/common/testdata/TestDataController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
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.simpleworklist.user.account.UserAccount;
7+
import org.woehlke.simpleworklist.user.domain.account.UserAccount;
88

99
import org.springframework.beans.factory.annotation.Autowired;
1010
import org.woehlke.simpleworklist.user.services.UserAccountLoginSuccessService;

‎src/main/java/org/woehlke/simpleworklist/common/testdata/TestDataService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.woehlke.simpleworklist.common.testdata;
22

3-
import org.woehlke.simpleworklist.user.account.UserAccount;
3+
import org.woehlke.simpleworklist.user.domain.account.UserAccount;
44

55
public interface TestDataService {
66

‎src/main/java/org/woehlke/simpleworklist/common/testdata/TestDataServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import org.woehlke.simpleworklist.domain.task.Task;
1010
import org.woehlke.simpleworklist.domain.task.TaskEnergy;
1111
import org.woehlke.simpleworklist.domain.task.TaskState;
12-
import org.woehlke.simpleworklist.user.account.UserAccount;
12+
import org.woehlke.simpleworklist.user.domain.account.UserAccount;
1313
import org.woehlke.simpleworklist.domain.task.TaskTime;
1414
import org.woehlke.simpleworklist.domain.context.ContextRepository;
1515
import org.woehlke.simpleworklist.domain.task.TaskRepository;

‎src/main/java/org/woehlke/simpleworklist/domain/context/Context.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//import org.hibernate.validator.constraints.SafeHtml;
88
import org.woehlke.simpleworklist.common.domain.AuditModel;
99
import org.woehlke.simpleworklist.common.domain.ComparableById;
10-
import org.woehlke.simpleworklist.user.account.UserAccount;
10+
import org.woehlke.simpleworklist.user.domain.account.UserAccount;
1111

1212
import javax.persistence.*;
1313
import javax.persistence.Index;

‎src/main/java/org/woehlke/simpleworklist/domain/context/ContextRepository.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.springframework.data.domain.Pageable;
55
import org.springframework.data.jpa.repository.JpaRepository;
66
import org.springframework.stereotype.Repository;
7-
import org.woehlke.simpleworklist.user.account.UserAccount;
7+
import org.woehlke.simpleworklist.user.domain.account.UserAccount;
88

99
import java.util.List;
1010

‎src/main/java/org/woehlke/simpleworklist/domain/context/ContextService.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package org.woehlke.simpleworklist.domain.context;
22

3-
import org.woehlke.simpleworklist.domain.context.Context;
4-
import org.woehlke.simpleworklist.domain.context.NewContextForm;
5-
import org.woehlke.simpleworklist.user.account.UserAccount;
3+
import org.woehlke.simpleworklist.user.domain.account.UserAccount;
64

75
import java.util.List;
86

‎src/main/java/org/woehlke/simpleworklist/domain/context/ContextServiceImpl.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44
import org.springframework.stereotype.Service;
55
import org.springframework.transaction.annotation.Propagation;
66
import org.springframework.transaction.annotation.Transactional;
7-
import org.woehlke.simpleworklist.domain.context.Context;
8-
import org.woehlke.simpleworklist.domain.context.ContextRepository;
9-
import org.woehlke.simpleworklist.domain.context.ContextService;
10-
import org.woehlke.simpleworklist.domain.context.NewContextForm;
11-
import org.woehlke.simpleworklist.user.account.UserAccount;
7+
import org.woehlke.simpleworklist.user.domain.account.UserAccount;
128
import org.woehlke.simpleworklist.domain.project.ProjectRepository;
139
import org.woehlke.simpleworklist.domain.task.TaskRepository;
1410

0 commit comments

Comments
 (0)