catch up with branch development
Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.authentication/src/account.dto b/org.eclipse.osbp.authentication/src/account.dto
index 873d751..2483a01 100644
--- a/org.eclipse.osbp.authentication/src/account.dto
+++ b/org.eclipse.osbp.authentication/src/account.dto
@@ -1,18 +1,7 @@
-/**
- *
- * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
- *
- */
+
import ns org.eclipse.osbp.authentication.account.entities.UserAccount
-import ns org.eclipse.osbp.authentication.account.entities.UserAccountFilter package org.eclipse.osbp.authentication.account.dtos {
+import ns org.eclipse.osbp.authentication.account.entities.UserAccountFilter
+package org.eclipse.osbp.authentication.account.dtos {
autoDto UserAccountDto wraps UserAccount {
diff --git a/org.eclipse.osbp.authentication/src/org/eclipse/osbp/authentication/vaadin/VaadinSessionManager.java b/org.eclipse.osbp.authentication/src/org/eclipse/osbp/authentication/vaadin/VaadinSessionManager.java
index c2b3851..3d75aec 100644
--- a/org.eclipse.osbp.authentication/src/org/eclipse/osbp/authentication/vaadin/VaadinSessionManager.java
+++ b/org.eclipse.osbp.authentication/src/org/eclipse/osbp/authentication/vaadin/VaadinSessionManager.java
@@ -12,7 +12,6 @@
*/
package org.eclipse.osbp.authentication.vaadin;
-//import com.google.inject.Inject;
import com.vaadin.server.VaadinSession;
import org.apache.shiro.session.Session;
import org.apache.shiro.session.SessionException;
@@ -22,7 +21,6 @@
import java.util.UUID;
-// TODO: Auto-generated Javadoc
/**
* depends on ideas of David Sowerby.
*
diff --git a/org.eclipse.osbp.authentication/src/org/eclipse/osbp/authentication/vaadin/VaadinSessionProvider.java b/org.eclipse.osbp.authentication/src/org/eclipse/osbp/authentication/vaadin/VaadinSessionProvider.java
index 5991614..5d08153 100644
--- a/org.eclipse.osbp.authentication/src/org/eclipse/osbp/authentication/vaadin/VaadinSessionProvider.java
+++ b/org.eclipse.osbp.authentication/src/org/eclipse/osbp/authentication/vaadin/VaadinSessionProvider.java
@@ -16,7 +16,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-// TODO: Auto-generated Javadoc
/**
* depends on ideas of David Sowerby.
*/
diff --git a/org.eclipse.osbp.user/META-INF/MANIFEST.MF b/org.eclipse.osbp.user/META-INF/MANIFEST.MF
index bc1f626..2706aef 100644
--- a/org.eclipse.osbp.user/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.user/META-INF/MANIFEST.MF
@@ -11,7 +11,8 @@
org.eclipse.osgi.services;bundle-version="3.4.0",
org.eclipse.e4.ui.model.workbench,
org.eclipse.e4.core.contexts;bundle-version="1.3.100",
- org.eclipse.e4.core.services
+ org.eclipse.e4.core.services,
+ javax.servlet;bundle-version="3.1.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.osbp.ui.api.customfields;version="0.9.0",
diff --git a/org.eclipse.osbp.user/src/org/eclipse/osbp/user/User.java b/org.eclipse.osbp.user/src/org/eclipse/osbp/user/User.java
index 4d0dd58..75df0fc 100644
--- a/org.eclipse.osbp.user/src/org/eclipse/osbp/user/User.java
+++ b/org.eclipse.osbp.user/src/org/eclipse/osbp/user/User.java
@@ -26,6 +26,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.vaadin.server.VaadinSession;
+
/**
* The Class User represents the subject currently signed in and carries his
* data. User can be injected. It conforms the vaaclipse AuthenticationProvider
@@ -122,6 +124,8 @@
}
put(EventUtils.DATA, this);
put(userClass, IUser.class);
+ VaadinSession session = VaadinSession.getCurrent();
+ session.setAttribute(IUser.class, this);
LOGGER.debug("User is initialized");
}
