From dce80c37c50523afa0b995c4755646bc253d5dec Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 20 Nov 2009 10:30:35 +0000
Subject: [PATCH] Simplify RIA

git-svn-id: https://svn.argeo.org/commons/trunk@3131 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 pom.xml                                       |  2 +-
 .../runtime/org.argeo.security.ria/pom.xml    |  9 +------
 .../src/WEB-INF/applicationContext.xml        | 13 ---------
 .../src/WEB-INF/osgi.xml                      | 13 ---------
 .../src/WEB-INF/security.xml                  | 11 --------
 .../src/WEB-INF/web.xml                       | 27 -------------------
 6 files changed, 2 insertions(+), 73 deletions(-)
 delete mode 100644 security/runtime/org.argeo.security.ria/src/WEB-INF/applicationContext.xml
 delete mode 100644 security/runtime/org.argeo.security.ria/src/WEB-INF/osgi.xml
 delete mode 100644 security/runtime/org.argeo.security.ria/src/WEB-INF/security.xml

diff --git a/pom.xml b/pom.xml
index bcb7caf4f..0bab17fde 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<packaging>pom</packaging>
 	<properties>
 		<developmentCycle>0.1</developmentCycle>
-		<version.argeo-ria>0.12.1</version.argeo-ria>
+		<version.argeo-ria>0.12.2-SNAPSHOT</version.argeo-ria>
 		<version.maven-argeo-osgi>0.1.21</version.maven-argeo-osgi>
 		<version.maven-bundle-plugin>2.0.0</version.maven-bundle-plugin>
 		<version.maven-argeo-qooxdoo>0.8.2.1</version.maven-argeo-qooxdoo>
diff --git a/security/runtime/org.argeo.security.ria/pom.xml b/security/runtime/org.argeo.security.ria/pom.xml
index a5ebb8cbc..39a61f691 100644
--- a/security/runtime/org.argeo.security.ria/pom.xml
+++ b/security/runtime/org.argeo.security.ria/pom.xml
@@ -109,14 +109,7 @@
 							javax.servlet.jsp.jstl.core,
 							javax.servlet.jsp.jstl.fmt,
 							javax.servlet.jsp.jstl.tlv,
-							javax.servlet.resources,
-							org.springframework.security.ui.webapp,
-							org.springframework.security.userdetails.memory,
-							org.springframework.web.context,
-							org.springframework.osgi.web.context.support,
-							org.springframework.web.filter,
-							org.springframework.ldap.core.support,
-							org.springframework.security
+							javax.servlet.resources
 						</Import-Package>
 						<Web-ContextPath>org.argeo.security.ria</Web-ContextPath>
 					</instructions>
diff --git a/security/runtime/org.argeo.security.ria/src/WEB-INF/applicationContext.xml b/security/runtime/org.argeo.security.ria/src/WEB-INF/applicationContext.xml
deleted file mode 100644
index 2b8a2e744..000000000
--- a/security/runtime/org.argeo.security.ria/src/WEB-INF/applicationContext.xml
+++ /dev/null
@@ -1,13 +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"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-
-	<import resource="osgi.xml" />
-	<import resource="security.xml" />
-
-</beans>
\ No newline at end of file
diff --git a/security/runtime/org.argeo.security.ria/src/WEB-INF/osgi.xml b/security/runtime/org.argeo.security.ria/src/WEB-INF/osgi.xml
deleted file mode 100644
index d344cc8d6..000000000
--- a/security/runtime/org.argeo.security.ria/src/WEB-INF/osgi.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/osgi"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
-	xmlns:security="http://www.springframework.org/schema/security"
-	xsi:schemaLocation="http://www.springframework.org/schema/osgi  
-       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd
-       http://www.springframework.org/schema/beans   
-       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-       http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.xsd">
-
-	<reference id="_authenticationManager"
-		interface="org.springframework.security.AuthenticationManager" />
-</beans:beans>
\ No newline at end of file
diff --git a/security/runtime/org.argeo.security.ria/src/WEB-INF/security.xml b/security/runtime/org.argeo.security.ria/src/WEB-INF/security.xml
deleted file mode 100644
index 883c65553..000000000
--- a/security/runtime/org.argeo.security.ria/src/WEB-INF/security.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<beans:beans xmlns="http://www.springframework.org/schema/security"
-	xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-              http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.4.xsd">
-
-	<http realm="User Interface" >
-		<intercept-url pattern="/**" access="ROLE_USER" />
-		<http-basic />
-	</http>
-
-</beans:beans>
diff --git a/security/runtime/org.argeo.security.ria/src/WEB-INF/web.xml b/security/runtime/org.argeo.security.ria/src/WEB-INF/web.xml
index d4675d5b3..3458e378a 100644
--- a/security/runtime/org.argeo.security.ria/src/WEB-INF/web.xml
+++ b/security/runtime/org.argeo.security.ria/src/WEB-INF/web.xml
@@ -5,31 +5,4 @@
 
 	<display-name>Argeo Security UI</display-name>
 
-	<!-- General -->
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>/WEB-INF/applicationContext.xml</param-value>
-	</context-param>
-
-	<listener>
-		<display-name>Spring Context</display-name>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
-	<context-param>
-		<param-name>contextClass</param-name>
-		<param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
-	</context-param>
-
-	<!--  Security -->
-	<filter>
-		<filter-name>springSecurityFilterChain</filter-name>
-		<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-	</filter>
-
-	<filter-mapping>
-		<filter-name>springSecurityFilterChain</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-
-
 </web-app>
-- 
2.30.2