Upgraded Spring to version 2.0.6.

This commit is contained in:
Ulrik Sandberg
2007-07-27 17:30:48 +00:00
parent 157c7d916f
commit a028695529
9 changed files with 79 additions and 55 deletions

View File

@@ -0,0 +1,16 @@
<ivy-module version="1.0">
<info organisation="org.springframework"
module="spring-src"
revision="2.0.6"
status="release"
publication="20070618040600"
default="true"
/>
<configurations>
<conf name="default" visibility="public" extends="source"/>
<conf name="source" visibility="public"/>
</configurations>
<publications>
<artifact name="spring-src" type="zip" ext="zip" conf="source"/>
</publications>
</ivy-module>

View File

@@ -1,22 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/test/easymock.jar" sourcepath="lib/source/easymock-src.zip"/>
<classpathentry kind="lib" path="lib/test/junit.jar" sourcepath="lib/source/junit-src.zip"/>
<classpathentry kind="lib" path="lib/global/commons-logging.jar" sourcepath="lib/source/commons-logging-src.zip"/>
<classpathentry kind="lib" path="lib/global/log4j.jar"/>
<classpathentry kind="lib" path="lib/global/spring-core.jar" sourcepath="lib/source/spring-src.zip"/>
<classpathentry kind="lib" path="lib/global/spring-beans.jar" sourcepath="lib/source/spring-src.zip"/>
<classpathentry kind="lib" path="lib/global/spring-context.jar" sourcepath="lib/source/spring-src.zip"/>
<classpathentry kind="lib" path="lib/global/spring-dao.jar" sourcepath="lib/source/spring-src.zip"/>
<classpathentry kind="lib" path="lib/global/ldapbp.jar"/>
<classpathentry kind="src" output="target/itest-classes" path="src/itest/java"/>
<classpathentry kind="lib" path="lib/test/spring-mock.jar" sourcepath="lib/source/spring-src.zip"/>
<classpathentry kind="lib" path="lib/global/commons-lang.jar" sourcepath="lib/source/commons-lang-src.zip"/>
<classpathentry kind="lib" path="lib/test/clover.jar"/>
<classpathentry kind="lib" path="lib/global/commons-collections.jar" sourcepath="lib/source/commons-collections-src.zip"/>
<classpathentry combineaccessrules="false" kind="src" path="/spring-ldap"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/test/easymock.jar" sourcepath="lib/source/easymock-src.zip"/>
<classpathentry kind="lib" path="lib/test/junit.jar" sourcepath="lib/source/junit-src.zip"/>
<classpathentry kind="lib" path="lib/global/commons-logging.jar" sourcepath="lib/source/commons-logging-src.zip"/>
<classpathentry kind="lib" path="lib/global/log4j.jar"/>
<classpathentry kind="lib" path="lib/global/spring-core.jar" sourcepath="lib/source/spring-src.zip"/>
<classpathentry kind="lib" path="lib/global/spring-beans.jar" sourcepath="lib/source/spring-src.zip"/>
<classpathentry kind="lib" path="lib/global/spring-context.jar" sourcepath="lib/source/spring-src.zip"/>
<classpathentry kind="lib" path="lib/global/spring-dao.jar" sourcepath="lib/source/spring-src.zip"/>
<classpathentry kind="lib" path="lib/global/ldapbp.jar"/>
<classpathentry kind="src" output="target/itest-classes" path="src/itest/java"/>
<classpathentry kind="lib" path="lib/test/spring-mock.jar" sourcepath="lib/source/spring-src.zip"/>
<classpathentry kind="lib" path="lib/global/commons-lang.jar" sourcepath="lib/source/commons-lang-src.zip"/>
<classpathentry kind="lib" path="lib/test/clover.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/spring-ldap"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

View File

@@ -23,8 +23,8 @@
<!-- test-time only dependencies -->
<dependency org="com.cenqua.clover" name="clover" rev="1.3.12" conf="test->default" />
<dependency org="org.springframework" name="spring-mock" rev="2.0.4" conf="test->default" />
<dependency org="junit" name="junit" rev="3.8.1" conf="test->default" />
<dependency org="org.springframework" name="spring-mock" rev="2.0.6" conf="test->default" />
<dependency org="junit" name="junit" rev="3.8.2" conf="test->default" />
<dependency org="easymock" name="easymock" rev="1.2_Java1.3" conf="test->default"/>
</dependencies>

View File

@@ -23,11 +23,11 @@
<dependency org="commons-lang" name="commons-lang" rev="2.1" />
<dependency org="commons-collections" name="commons-collections" rev="3.1" />
<dependency org="org.springframework" name="spring-ldap" rev="latest.integration"/>
<dependency org="org.springframework" name="spring-beans" rev="2.0.4"/>
<dependency org="org.springframework" name="spring-core" rev="2.0.4"/>
<dependency org="org.springframework" name="spring-context" rev="2.0.4"/>
<dependency org="org.springframework" name="spring-dao" rev="2.0.4"/>
<dependency org="org.springframework" name="spring-src" rev="2.0.4" conf="source->source">
<dependency org="org.springframework" name="spring-beans" rev="2.0.6"/>
<dependency org="org.springframework" name="spring-core" rev="2.0.6"/>
<dependency org="org.springframework" name="spring-context" rev="2.0.6"/>
<dependency org="org.springframework" name="spring-dao" rev="2.0.6"/>
<dependency org="org.springframework" name="spring-src" rev="2.0.6" conf="source->source">
<artifact name="spring-src" type="zip"/>
</dependency>
<dependency org="com.sun" name="ldapbp" rev="1.0" />
@@ -42,10 +42,10 @@
<!-- test time only dependencies -->
<dependency org="com.cenqua.clover" name="clover" rev="1.3.12" conf="test->default" />
<dependency org="org.springframework" name="spring-mock" rev="2.0.4"
<dependency org="org.springframework" name="spring-mock" rev="2.0.6"
conf="test->default"/>
<dependency org="gsbase" name="gsbase" rev="2.0.1" conf="test->default"/>
<dependency org="junit" name="junit" rev="3.8.1" conf="test->default"/>
<dependency org="junit" name="junit" rev="3.8.2" conf="test->default"/>
<dependency org="junit-addons" name="junit-addons" rev="1.4" conf="test->default"/>
<dependency org="junitperf" name="junitperf" rev="1.8" conf="test->default"/>
<dependency org="org.easymock" name="easymock" rev="2.2" conf="test->default"/>

View File

@@ -31,9 +31,9 @@
<dependency org="org.springframework" name="spring-ldap"
rev="latest.integration" conf="global->default;source->@" />
<dependency org="org.springframework" name="spring-web"
rev="2.0.4" />
rev="2.0.6" />
<dependency org="org.springframework" name="spring-webmvc"
rev="2.0.4" />
rev="2.0.6" />
<dependency org="org.springframework" name="spring-webflow"
rev="1.0.2" />
<dependency org="org.springframework" name="spring-webflow-src"
@@ -55,16 +55,16 @@
</dependency>
<dependency org="org.springframework" name="spring-aop"
rev="2.0.4" />
rev="2.0.6" />
<dependency org="aopalliance" name="aopalliance" rev="1.0" />
<!-- kind of nasty, acegi needs some 1.2.7 stuff, so we override with newer! -->
<dependency org="org.springframework" name="spring-jdbc"
rev="2.0.4" />
rev="2.0.6" />
<dependency org="org.springframework" name="spring-remoting"
rev="2.0.4" />
rev="2.0.6" />
<dependency org="org.springframework" name="spring-support"
rev="2.0.4" />
rev="2.0.6" />
<!-- dependencies for Apache Directory Server -->
<dependency org="org.apache.directory.server"
@@ -114,8 +114,8 @@
<dependency org="com.cenqua.clover" name="clover" rev="1.3.12"
conf="test->default" />
<dependency org="org.springframework" name="spring-mock"
rev="2.0.4" conf="test->default" />
<dependency org="junit" name="junit" rev="3.8.1"
rev="2.0.6" conf="test->default" />
<dependency org="junit" name="junit" rev="3.8.2"
conf="test->default" />
<dependency org="easymock" name="easymock" rev="1.2_Java1.3"
conf="test->default" />

View File

@@ -10,6 +10,15 @@ http://www.ietf.org/rfc/rfc2255.txt
http://www.ietf.org/rfc/rfc2256.txt
http://www.ietf.org/rfc/rfc2696.txt
Changes in version 1.2-RC1 (5.12.2007)
-------------------------------------------
A number of API-breaking changes have been made in this release.
Consequently this is NOT a drop-in replacement for Spring LDAP 1.1.2,
though upgrading should not present all that much work. Please see
the supplied upgrade guide for details.
* Upgraded to Spring 2.0.6 internally. Spring 1.2.x is still supported.
Changes in version 1.2-RC1 (5.12.2007)
-------------------------------------------
A number of API-breaking changes have been made in this release,
@@ -63,7 +72,7 @@ upgrade guide for details.
* Upgraded to Acegi Security 1.0.3 (LDAP-61).
* Upgraded to ApacheDS 1.0.0 (LDAP-32).
* Upgraded to Spring 2.0.4 internally. Spring 1.2.x is still supported (LDAP-35, LDAP-51).
* Upgraded to Spring WebFlow 1.0.2 in the Person sample (LDAP-60).

View File

@@ -24,15 +24,15 @@
rev="1.0.4" />
<dependency org="commons-lang" name="commons-lang" rev="2.1" />
<dependency org="org.springframework" name="spring-beans"
rev="2.0.4" />
rev="2.0.6" />
<dependency org="org.springframework" name="spring-core"
rev="2.0.4" />
rev="2.0.6" />
<dependency org="org.springframework" name="spring-context"
rev="2.0.4" />
rev="2.0.6" />
<dependency org="org.springframework" name="spring-dao"
rev="2.0.4" />
rev="2.0.6" />
<dependency org="org.springframework" name="spring-src"
rev="2.0.4" conf="source->source">
rev="2.0.6" conf="source->source">
<artifact name="spring-src" type="zip" />
</dependency>
<dependency org="com.sun" name="ldapbp" rev="1.0" />
@@ -46,11 +46,11 @@
</dependency>
<!-- kind of nasty, acegi needs some 1.2.7 stuff, so we override with newer! -->
<dependency org="org.springframework" name="spring-jdbc"
rev="2.0.4" conf="buildtime->default" />
rev="2.0.6" conf="buildtime->default" />
<dependency org="org.springframework" name="spring-remoting"
rev="2.0.4" conf="buildtime->default" />
rev="2.0.6" conf="buildtime->default" />
<dependency org="org.springframework" name="spring-support"
rev="2.0.4" conf="buildtime->default" />
rev="2.0.6" conf="buildtime->default" />
<dependency org="org.tigris" name="svnant" rev="1.0.0"
conf="buildtime->default">
@@ -65,7 +65,7 @@
<dependency org="com.cenqua.clover" name="clover" rev="1.3.12"
conf="test->default" />
<dependency org="org.springframework" name="spring-mock"
rev="2.0.4" conf="test->default" />
rev="2.0.6" conf="test->default" />
<dependency org="gsbase" name="gsbase" rev="2.0.1"
conf="test->default" />
<dependency org="junit" name="junit" rev="3.8.1"
@@ -87,7 +87,7 @@
<dependency org="cglib" name="cglib-nodep" rev="2.1_3"
conf="test->default" />
<dependency org="org.springframework" name="spring-aop"
rev="2.0.4" conf="test->default" />
rev="2.0.6" conf="test->default" />
<dependency org="aopalliance" name="aopalliance" rev="1.0"
conf="test->default" />
<dependency org="hsqldb" name="hsqldb" rev="1.8.0.7"

View File

@@ -88,32 +88,32 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>2.0.4</version>
<version>2.0.6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>2.0.4</version>
<version>2.0.6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>2.0.4</version>
<version>2.0.6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-dao</artifactId>
<version>2.0.4</version>
<version>2.0.6</version>
<scope>provided</scope>
</dependency>
<!-- Test Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<version>3.8.2</version>
<scope>test</scope>
</dependency>
<dependency>