work in progres

Author: thomaswoehlke

etc/serialversions/getserialversionid.cmd

@@ -43,6 +43,6 @@ serialver org.woehlke.simpleworklist.user.selfservice.UserChangeNameForm >> ..\.
 serialver org.woehlke.simpleworklist.user.selfservice.UserChangePasswordForm >> ..\..\etc\serialversions.txt
 @rem serialver org.woehlke.simpleworklist.user.UserDetailsBean >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.register.UserRegistrationForm >> ..\..\etc\serialversions.txt
-serialver org.woehlke.simpleworklist.user.UserSessionBean >> ..\..\etc\serialversions.txt
+serialver org.woehlke.simpleworklist.session.UserSessionBean >> ..\..\etc\serialversions.txt
 cd ..\..
 echo FINISHED

etc/serialversions/serialversions.txt

@@ -25,4 +25,4 @@ org.woehlke.simpleworklist.language.UserChangeLanguageForm:    private static fi
 org.woehlke.simpleworklist.user.selfservice.UserChangeNameForm:    private static final long serialVersionUID = 5120488382888268418L;
 org.woehlke.simpleworklist.user.selfservice.UserChangePasswordForm:    private static final long serialVersionUID = 9149342594823222054L;
 org.woehlke.simpleworklist.user.register.UserRegistrationForm:    private static final long serialVersionUID = 6864871862706880939L;
-org.woehlke.simpleworklist.user.UserSessionBean:    private static final long serialVersionUID = -6649686058228455825L;
+org.woehlke.simpleworklist.session.UserSessionBean:    private static final long serialVersionUID = -6649686058228455825L;

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

@@ -17,7 +17,7 @@
 import org.woehlke.simpleworklist.project.ProjectService;
 import org.woehlke.simpleworklist.user.messages.User2UserMessageService;
 import org.woehlke.simpleworklist.user.account.UserAccountService;
-import org.woehlke.simpleworklist.user.UserSessionBean;
+import org.woehlke.simpleworklist.session.UserSessionBean;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.woehlke.simpleworklist.user.account.UserAccountAccessService;

src/main/java/org/woehlke/simpleworklist/context/ContextController.java

@@ -8,7 +8,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.woehlke.simpleworklist.common.AbstractController;
-import org.woehlke.simpleworklist.user.UserSessionBean;
+import org.woehlke.simpleworklist.session.UserSessionBean;
 
 import org.springframework.beans.factory.annotation.Autowired;
 

src/main/java/org/woehlke/simpleworklist/project/ProjectController.java

@@ -15,15 +15,12 @@
 import org.woehlke.simpleworklist.task.*;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 import org.woehlke.simpleworklist.breadcrumb.Breadcrumb;
-import org.woehlke.simpleworklist.user.UserSessionBean;
+import org.woehlke.simpleworklist.session.UserSessionBean;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Locale;
-import java.util.UUID;
-
-import static org.woehlke.simpleworklist.project.Project.rootProjectId;
 
 /**
  * Created by tw on 14.02.16.

src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java

@@ -15,7 +15,7 @@
 import org.woehlke.simpleworklist.common.AbstractController;
 import org.woehlke.simpleworklist.context.Context;
 import org.woehlke.simpleworklist.task.*;
-import org.woehlke.simpleworklist.user.UserSessionBean;
+import org.woehlke.simpleworklist.session.UserSessionBean;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 
 import javax.validation.Valid;

src/main/java/org/woehlke/simpleworklist/project/ProjectControllerService.java

@@ -4,7 +4,7 @@
 import org.springframework.validation.BindingResult;
 import org.woehlke.simpleworklist.context.Context;
 import org.woehlke.simpleworklist.task.Task;
-import org.woehlke.simpleworklist.user.UserSessionBean;
+import org.woehlke.simpleworklist.session.UserSessionBean;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 
 import java.util.Locale;

src/main/java/org/woehlke/simpleworklist/project/ProjectControllerServiceImpl.java

@@ -11,7 +11,7 @@
 import org.woehlke.simpleworklist.context.ContextService;
 import org.woehlke.simpleworklist.task.Task;
 import org.woehlke.simpleworklist.task.TaskService;
-import org.woehlke.simpleworklist.user.UserSessionBean;
+import org.woehlke.simpleworklist.session.UserSessionBean;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 
 import java.util.List;

src/main/java/org/woehlke/simpleworklist/search/SearchController.java

@@ -9,7 +9,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.woehlke.simpleworklist.common.AbstractController;
 import org.woehlke.simpleworklist.breadcrumb.Breadcrumb;
-import org.woehlke.simpleworklist.user.UserSessionBean;
+import org.woehlke.simpleworklist.session.UserSessionBean;
 import org.woehlke.simpleworklist.context.Context;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 

…simpleworklist/user/UserSessionBean.java …pleworklist/session/UserSessionBean.javasrc/main/java/org/woehlke/simpleworklist/user/UserSessionBean.java renamed to src/main/java/org/woehlke/simpleworklist/session/UserSessionBean.java src/main/java/org/woehlke/simpleworklist/user/UserSessionBean.java renamed to src/main/java/org/woehlke/simpleworklist/session/UserSessionBean.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user;
+package org.woehlke.simpleworklist.session;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;