Fix issues with security dependencies

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

diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/ria-servlet.xml b/modules/server/org.argeo.slc.webapp.war/WEB-INF/ria-servlet.xml
deleted file mode 100644 (file)
index 484aae9..0000000
--- a/modules/server/org.argeo.slc.webapp.war/WEB-INF/ria-servlet.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd 
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-
-       <bean name="/getCredentials.ria" class="org.argeo.slc.web.mvc.management.GetCredentials" />
-
-       <!-- MVC -->
-       <bean id="handlerMapping"
-               class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
-       </bean>
-
-</beans>
\ No newline at end of file

diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/web.xml b/modules/server/org.argeo.slc.webapp.war/WEB-INF/web.xml
index f224ae562a046db9df89d8b6d7f5118b4356f92a..34a837fbf2e64a4e187a7d438fe2f9dcb220bdd4 100644 (file)
--- a/modules/server/org.argeo.slc.webapp.war/WEB-INF/web.xml
+++ b/modules/server/org.argeo.slc.webapp.war/WEB-INF/web.xml
@@ -70,21 +70,6 @@
                <url-pattern>/dist/*</url-pattern>
        </servlet-mapping>
 
-       <!-- RIA servlet -->
-       <servlet>
-               <servlet-name>ria</servlet-name>
-               <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-               <init-param>
-                       <param-name>contextClass</param-name>
-                       <param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
-               </init-param>
-               <load-on-startup>1</load-on-startup>
-       </servlet>
-       <servlet-mapping>
-               <servlet-name>ria</servlet-name>
-               <url-pattern>*.ria</url-pattern>
-       </servlet-mapping>
-
        <!-- General -->
        <context-param>
                <param-name>contextConfigLocation</param-name>

diff --git a/pom.xml b/pom.xml
index 28f56704124b6991e27f77e095b1a16e48cee951..7a3b1fe3664994b36f66fa945ffcdc7dde14b7e5 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -196,6 +196,15 @@ limitations under the License.
        </build>
        <dependencyManagement>
                <dependencies>
+                       <!-- Third Parties -->
+                       <dependency>
+                               <groupId>org.argeo.dep</groupId>
+                               <artifactId>versions</artifactId>
+                               <version>1.0.1-SNAPSHOT</version>
+                               <type>pom</type>
+                               <scope>import</scope>
+                       </dependency>
+
                        <!-- SLC (itself) -->
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
@@ -325,14 +334,6 @@ limitations under the License.
                                <version>${version.argeo-commons}</version>
                        </dependency>
 
-                       <!-- Third Parties -->
-                       <dependency>
-                               <groupId>org.argeo.dep</groupId>
-                               <artifactId>versions</artifactId>
-                               <version>1.0.1-SNAPSHOT</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
                </dependencies>
        </dependencyManagement>
        <repositories>

diff --git a/runtime/org.argeo.slc.server/pom.xml b/runtime/org.argeo.slc.server/pom.xml
index aae4a73fcaee48c72e0d7d1b8f169061fc8e73a7..5d1f3ac8a8be43c4cbdd1ab6ea440b5a9355c95c 100644 (file)
--- a/runtime/org.argeo.slc.server/pom.xml
+++ b/runtime/org.argeo.slc.server/pom.xml
@@ -113,10 +113,6 @@
                </dependency>
 
                <!-- Security -->
-               <dependency>
-                       <groupId>org.springframework.security</groupId>
-                       <artifactId>org.springframework.security</artifactId>
-               </dependency>
 
                <dependency>
                        <groupId>com.springsource.json</groupId>

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/management/GetCredentials.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/management/GetCredentials.java
deleted file mode 100644 (file)
index 9cac10a..0000000
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/management/GetCredentials.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.argeo.slc.web.mvc.management;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.security.Authentication;
-import org.springframework.security.GrantedAuthority;
-import org.springframework.security.context.SecurityContextHolder;
-import org.springframework.web.HttpRequestHandler;
-
-import com.springsource.json.writer.JSONWriter;
-import com.springsource.json.writer.JSONWriterImpl;
-
-public class GetCredentials implements HttpRequestHandler {
-
-       public void handleRequest(HttpServletRequest request,
-                       HttpServletResponse response) throws ServletException, IOException {
-               response.setContentType("application/json");
-
-               Authentication authentication = SecurityContextHolder.getContext()
-                               .getAuthentication();
-
-               JSONWriter jsonWriter = new JSONWriterImpl(response.getWriter())
-                               .object().key("user").value(authentication.getName());
-               jsonWriter.key("roles").array();
-               for (GrantedAuthority ga : authentication.getAuthorities()) {
-                       jsonWriter.value(ga.getAuthority());
-               }
-               jsonWriter.endArray();
-               jsonWriter.endObject();
-       }
-
-}