From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 2 Jul 2009 18:52:38 +0000 (+0000)
Subject: Add Spring Security
X-Git-Tag: argeo-slc-2.1.7~1702
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=fc3ff9f238f2f117745e1e39226419addc170a4f;p=gpl%2Fargeo-slc.git

Add Spring Security

git-svn-id: https://svn.argeo.org/slc/trunk@2676 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 2e75d4664..4f5a95cc5 100644
--- a/dep/org.argeo.slc.dep.server/pom.xml
+++ b/dep/org.argeo.slc.dep.server/pom.xml
@@ -136,12 +136,13 @@
 			<artifactId>com.springsource.com.mysql.jdbc</artifactId>
 		</dependency>
 
-		<!-- Spring Security
+		<!--
+			Spring Security -->
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>org.springframework.security</artifactId>
-		</dependency> -->
-		
+		</dependency>
+
 		<!-- Required in JDK 1.5 -->
 		<dependency>
 			<groupId>com.sun.xml</groupId>
diff --git a/pom.xml b/pom.xml
index 8a5c737f6..9d6fe1da0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -504,6 +504,19 @@ limitations under the License.
 				<version>1.0.0.argeo4</version>
 			</dependency>
 
+			<!-- Security -->
+			<dependency>
+				<groupId>org.springframework.security</groupId>
+				<artifactId>org.springframework.security</artifactId>
+				<version>2.0.4.A</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.springframework</groupId>
+						<artifactId>org.springframework.web</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+
 			<!-- AOP -->
 			<dependency>
 				<groupId>org.aspectj</groupId>
@@ -685,13 +698,6 @@ limitations under the License.
 				<version>2.0.8</version>
 			</dependency>
 
-			<!-- Security
-			<dependency>
-				<groupId>org.springframework.security</groupId>
-				<artifactId>org.springframework.security</artifactId>
-				<version>2.0.4.A</version>
-			</dependency>
- -->
 			<!-- Tomcat -->
 			<dependency>
 				<groupId>org.apache.catalina</groupId>