Centralise Subject in CmsSession

git-svn-id: https://svn.argeo.org/commons/trunk@8083 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java b/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java
index 1e04bc050ac46922516c429f0c4c326fd50c5026..7b32b00f85ba3a43c51b7ef65a7c1a5aaaf1ccdc 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java
+++ b/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java
@@ -49,7 +49,6 @@ abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implements
                this.workspace = workspace;
 
                // Initial login
-               Subject subject = new Subject();
                try {
                        new ArgeoLoginContext(KernelHeader.LOGIN_CONTEXT_USER, subject)
                                        .login();

diff --git a/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java b/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java
index 45fd4b3ad21328f2d1492e910c76b843b0b5739a..10964c717d0b26d82147b2c6c0bba1e4f2c0ba55 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java
@@ -130,7 +130,7 @@ public class UserMenu extends Shell implements CmsStyles, CallbackHandler {
        protected void login() {
                CmsSession cmsSession = (CmsSession) getDisplay().getData(
                                CmsSession.KEY);
-               Subject subject = new Subject();
+               Subject subject = cmsSession.getSubject();
                try {
                        //
                        // LOGIN
@@ -151,7 +151,7 @@ public class UserMenu extends Shell implements CmsStyles, CallbackHandler {
        protected void logout() {
                final CmsSession cmsSession = (CmsSession) getDisplay().getData(
                                CmsSession.KEY);
-               Subject subject = new Subject();
+               Subject subject = cmsSession.getSubject();
                try {
                        //
                        // LOGOUT