From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 3 Jul 2009 15:38:00 +0000 (+0000)
Subject: Add security
X-Git-Tag: argeo-slc-2.1.7~1693
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;ds=sidebyside;h=ee152aa8c21d0ea363d2087413d29bc5eeb35099;hp=5f8a5180f4e0a9532a4549718baf5779f288688e;p=gpl%2Fargeo-slc.git

Add security

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

diff --git a/dep/org.argeo.slc.dep.server/pom.xml b/dep/org.argeo.slc.dep.server/pom.xml
index 4f5a95cc5..9f062156d 100644
--- a/dep/org.argeo.slc.dep.server/pom.xml
+++ b/dep/org.argeo.slc.dep.server/pom.xml
@@ -136,13 +136,6 @@
 			<artifactId>com.springsource.com.mysql.jdbc</artifactId>
 		</dependency>
 
-		<!--
-			Spring Security -->
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>org.springframework.security</artifactId>
-		</dependency>
-
 		<!-- Required in JDK 1.5 -->
 		<dependency>
 			<groupId>com.sun.xml</groupId>
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
new file mode 100644
index 000000000..484aae907
--- /dev/null
+++ b/modules/server/org.argeo.slc.webapp.war/WEB-INF/ria-servlet.xml
@@ -0,0 +1,15 @@
+<?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 34a837fbf..f224ae562 100644
--- 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,6 +70,21 @@
 		<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 9d6fe1da0..67cb7dfd2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -516,6 +516,11 @@ limitations under the License.
 					</exclusion>
 				</exclusions>
 			</dependency>
+			<dependency>
+				<groupId>org.antlr</groupId>
+				<artifactId>com.springsource.org.antlr</artifactId>
+				<version>3.0.1</version>
+			</dependency>
 
 			<!-- AOP -->
 			<dependency>