From 34527c33053e8896694df913ea43c2dfd5730091 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Mon, 3 Sep 2007 15:47:39 +0000
Subject: [PATCH] Changed spring version to 1.2.9 and modified dependencies to
 get build to work with this version. Corrected some javadoc links.

---
 adapters/cas/pom.xml |  4 +++
 core/pom.xml         | 13 ++++++++--
 pom.xml              | 59 +++++++++++++++++++++-----------------------
 3 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/adapters/cas/pom.xml b/adapters/cas/pom.xml
index 46f5a5ca02..090adff524 100644
--- a/adapters/cas/pom.xml
+++ b/adapters/cas/pom.xml
@@ -18,5 +18,9 @@
       <artifactId>cas</artifactId>
       <version>2.0.12</version>
     </dependency>
+    <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-web</artifactId>
+    </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
index 2ac76a993b..da2989a4a0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
 	</parent>
 	<packaging>jar</packaging>
 	<artifactId>acegi-security</artifactId>
-	<name>Acegi Security System for Spring</name>
+	<name>Acegi Security Core</name>
 
 	<scm>
 		<connection>scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity/core</connection>
@@ -17,6 +17,10 @@
 
 	<dependencies>
 		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-core</artifactId>
+		</dependency>
+        <dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-remoting</artifactId>
 		</dependency>
@@ -30,6 +34,11 @@
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+			<optional>true</optional>
+		</dependency>
+        <dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-mock</artifactId>
 			<optional>true</optional>
@@ -40,7 +49,7 @@
             <artifactId>spring-ldap</artifactId>
             <version>1.1.2</version>
             <optional>true</optional>
-        </dependency>        
+        </dependency>
         <dependency>
 			<groupId>net.sf.ehcache</groupId>
 			<artifactId>ehcache</artifactId>
diff --git a/pom.xml b/pom.xml
index d04c23788b..4b64e8a801 100644
--- a/pom.xml
+++ b/pom.xml
@@ -444,45 +444,32 @@
 						<link>
 							http://java.sun.com/j2se/1.5.0/docs/api
 						</link>
+                        <link>
+                            http://www.springframework.org/docs/api/
+                        </link>
 						<link>
-							http://jakarta.apache.org/commons/dbcp/apidocs/
+							http://commons.apache.org/dbcp/apidocs/
 						</link>
 						<link>
-							http://jakarta.apache.org/commons/fileupload/apidocs/
+							http://commons.apache.org/httpclient/apidocs/
 						</link>
 						<link>
-							http://jakarta.apache.org/commons/httpclient/apidocs/
+							http://commons.apache.org/pool/apidocs/
 						</link>
+                        <link>
+                            http://commons.apache.org/lang/api/
+                        </link>
+                        <link>
+                            http://commons.apache.org/codec/apidocs/
+                        </link>
+                        <link>
+                            http://commons.apache.org/collections/apidocs/
+                        </link>
 						<link>
-							http://jakarta.apache.org/commons/logging/api/
+							http://velocity.apache.org/engine/releases/velocity-1.5/apidocs/
 						</link>
 						<link>
-							http://jakarta.apache.org/commons/pool/apidocs/
-						</link>
-						<link>http://www.junit.org/junit/javadoc/</link>
-						<link>
-							http://logging.apache.org/log4j/docs/api/
-						</link>
-						<link>
-							http://jakarta.apache.org/velocity/api/
-						</link>
-						<link>
-							http://www.springframework.org/docs/api/
-						</link>
-						<link>
-							http://jakarta.apache.org/commons/lang/api/
-						</link>
-						<link>
-							http://developer.ja-sig.org/projects/cas/multiproject/cas-server/apidocs/
-						</link>
-						<link>
-							http://jakarta.apache.org/commons/codec/apidocs/
-						</link>
-						<link>
-							http://jakarta.apache.org/commons/collections/api/
-						</link>
-						<link>
-							http://jakarta.apache.org/commons/logging/apidocs/
+							http://developer.ja-sig.org/projects/cas/cas-server-core/cas-server/cas-server-core/apidocs/
 						</link>
 						<link>
 							http://tomcat.apache.org/tomcat-5.0-doc/servletapi/
@@ -499,6 +486,11 @@
 
 	<dependencyManagement>
 		<dependencies>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-core</artifactId>
+				<version>${spring.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-mock</artifactId>
@@ -509,6 +501,11 @@
 				<artifactId>spring-remoting</artifactId>
 				<version>${spring.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-web</artifactId>
+				<version>${spring.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-jdbc</artifactId>
@@ -530,7 +527,7 @@
 
 	</dependencyManagement>
 	<properties>
-		<spring.version>2.0.4</spring.version>
+		<spring.version>1.2.9</spring.version>
 	</properties>
 
 </project>
\ No newline at end of file