- Migrate to Spring 3.1

- Remove Acegy - Fix editor partially
2012-02-12 02:55:42 -03:00
parent 2287825292
commit 5fd6ba30f5
36 changed files with 2154 additions and 2402 deletions
--- a/wise-webapp/src/main/java/com/wisemapping/security/Utils.java
+++ b/wise-webapp/src/main/java/com/wisemapping/security/Utils.java
@@ -1,58 +1,56 @@
-/*
-*    Copyright [2011] [wisemapping]
-*
-*   Licensed under WiseMapping Public License, Version 1.0 (the "License").
-*   It is basically the Apache License, Version 2.0 (the "License") plus the
-*   "powered by wisemapping" text requirement on every single page;
-*   you may not use this file except in compliance with the License.
-*   You may obtain a copy of the license at
-*
-*       http://www.wisemapping.org/license
-*
-*   Unless required by applicable law or agreed to in writing, software
-*   distributed under the License is distributed on an "AS IS" BASIS,
-*   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*   See the License for the specific language governing permissions and
-*   limitations under the License.
-*/
-
-package com.wisemapping.security;
-
-import com.wisemapping.model.User;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.acegisecurity.providers.AbstractAuthenticationToken;
-import org.acegisecurity.context.SecurityContextHolder;
-import org.acegisecurity.Authentication;
-
-
-public class Utils {
-    private Utils() {
-    }
-
-    public static User getUser(final HttpServletRequest request) {
-
-        final AbstractAuthenticationToken token = (AbstractAuthenticationToken) request.getUserPrincipal();
-        User result = null;
-        if (token != null) {
-            final com.wisemapping.security.User user = (com.wisemapping.security.User) token.getPrincipal();
-            result = user.getModel();
-        }
-        return result;
-    }
-
-    public static User getUser()
-    {
-        User user = null;
-        final Authentication auth = SecurityContextHolder.getContext().getAuthentication();
-        if (auth != null && auth.getDetails() != null)
-        {
-            final Object principal = auth.getPrincipal();
-            if (principal != null && principal instanceof com.wisemapping.security.User) {
-                user = ((com.wisemapping.security.User)principal).getModel();
-            }
-        }
-        return user;
-    }
-}
+/*
+*    Copyright [2011] [wisemapping]
+*
+*   Licensed under WiseMapping Public License, Version 1.0 (the "License").
+*   It is basically the Apache License, Version 2.0 (the "License") plus the
+*   "powered by wisemapping" text requirement on every single page;
+*   you may not use this file except in compliance with the License.
+*   You may obtain a copy of the license at
+*
+*       http://www.wisemapping.org/license
+*
+*   Unless required by applicable law or agreed to in writing, software
+*   distributed under the License is distributed on an "AS IS" BASIS,
+*   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*   See the License for the specific language governing permissions and
+*   limitations under the License.
+*/
+
+package com.wisemapping.security;
+
+import com.wisemapping.model.User;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.security.authentication.AbstractAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+
+import javax.servlet.http.HttpServletRequest;
+
+final public class Utils {
+    private Utils() {
+    }
+
+    public static User getUser(@NotNull final HttpServletRequest request) {
+
+        final AbstractAuthenticationToken token = (AbstractAuthenticationToken) request.getUserPrincipal();
+        User result = null;
+        if (token != null) {
+            final UserDetails userDetails = (UserDetails) token.getPrincipal();
+            result = userDetails.getUser();
+        }
+        return result;
+    }
+
+    public static User getUser() {
+        User result = null;
+        final Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+        if (auth != null && auth.getDetails() != null)
+        {
+            final Object principal = auth.getPrincipal();
+            if (principal != null && principal instanceof UserDetails) {
+                result = ((UserDetails)principal).getUser();
+            }
+        }
+        return result;
+    }
+}