Release version 3.2.5

Issue: SPR-11018
(cherry picked from commit e9a24da)

.gitignore

@@ -15,7 +15,6 @@ spring-test/test-output/
 .gradle
 argfile*
 pom.xml
-activemq-data/
 
 /build
 buildSrc/build

CONTRIBUTING.md

@@ -47,11 +47,13 @@ future pull requests as well, simply so that the Spring Framework team knows
 immediately that this process is complete.
 
 
-## Create your branch from `master`
+## Create your branch from `3.2.x`
 
-Master currently represents work toward Spring Framework 4.0. Please submit
-all pull requests there, even bug fixes and minor improvements. Backports to
-`3.2.x` will be considered on a case-by-case basis.
+If your pull request addresses a bug or improvement, please create your branch
+from Spring Framework's `3.2.x` branch. `master` is reserved for work on new features
+for the next major version of the framework. Rest assured that if your pull
+request is accepted and merged into `3.2.x`, these changes will also eventually
+be merged into `master`.
 
 
 ## Use short branch names
@@ -127,7 +129,7 @@ e.g.
  * ...
  *
  * @author First Last
- * @since 4.0
+ * @since 3.2
  * @see ...
  */
 ```

README.md

@@ -10,6 +10,8 @@ The framework also serves as the foundation for [Spring Integration][], [Spring
 Batch][] and the rest of the Spring [family of projects][]. Browse the
 repositories under the [SpringSource organization][] on GitHub for a full list.
 
+[.NET][] and [Python][] variants are available as well.
+
 ## Downloading artifacts
 See [downloading Spring artifacts][] for Maven repository information. Unable to
 use Maven or other transitive dependency management tools? See [building a
@@ -33,28 +35,20 @@ simple step-by-step instructions.
 ## Building from source
 The Spring Framework uses a [Gradle][]-based build system. In the instructions
 below, [`./gradlew`][] is invoked from the root of the source tree and serves as
-a cross-platform, self-contained bootstrap mechanism for the build.
-
-### prerequisites
-
-[Git][] and [OpenJDK 8 early access build 100 or later][JDK8 build]
-
-Be sure that your `JAVA_HOME` environment variable points to the `jdk1.8.0` folder
-extracted from the JDK download.
+a cross-platform, self-contained bootstrap mechanism for the build. The only
+prerequisites are [Git][] and JDK 1.7+.
 
 ### check out sources
 `git clone git://github.com/SpringSource/spring-framework.git`
 
-### import sources into your IDE
-Run `./import-into-eclipse.sh` or read `import-into-idea.md` as appropriate.
-> **Note:** Per the prerequisites above, ensure that you have JDK 8 configured
-properly in your IDE.
+### compile and test, build all jars, distribution zips and docs
+`./gradlew build`
 
 ### install all spring-\* jars into your local Maven cache
 `./gradlew install`
 
-### compile and test, build all jars, distribution zips and docs
-`./gradlew build`
+### import sources into your IDE
+Run `./import-into-eclipse.sh` or read `import-into-idea.md` as appropriate.
 
 ... and discover more commands with `./gradlew tasks`. See also the [Gradle
 build and release FAQ][].
@@ -74,6 +68,8 @@ The Spring Framework is released under version 2.0 of the [Apache License][].
 [Spring Batch]: https://github.com/SpringSource/spring-batch
 [family of projects]: http://springsource.org/projects
 [SpringSource organization]: https://github.com/SpringSource
+[.NET]: https://github.com/SpringSource/spring-net
+[Python]: https://github.com/SpringSource/spring-python
 [downloading Spring artifacts]: https://github.com/SpringSource/spring-framework/wiki/Downloading-Spring-artifacts
 [building a distribution with dependencies]: https://github.com/SpringSource/spring-framework/wiki/Building-a-distribution-with-dependencies
 [Javadoc]: http://static.springsource.org/spring-framework/docs/current/javadoc-api
@@ -90,7 +86,6 @@ The Spring Framework is released under version 2.0 of the [Apache License][].
 [Gradle]: http://gradle.org
 [`./gradlew`]: http://vimeo.com/34436402
 [Git]: http://help.github.com/set-up-git-redirect
-[JDK8 build]: http://jdk8.java.net/download.html
 [Gradle build and release FAQ]: https://github.com/SpringSource/spring-framework/wiki/Gradle-build-and-release-FAQ
 [Pull requests]: http://help.github.com/send-pull-requests
 [contributor guidelines]: https://github.com/SpringSource/spring-framework/blob/master/CONTRIBUTING.md

build.gradle

@@ -12,7 +12,12 @@ configure(allprojects) { project ->
 	group = "org.springframework"
 	version = qualifyVersionIfNecessary(version)
 
-	ext.aspectjVersion  = "1.8.0.M1"
+	// The following is a work-around for allowing to build on JDK 8 until the
+	// Gradle build uses Ant 1.9.x by default. This is necessary to avoid the
+	// "Class not found: javac1.8" issue with Ant versions prior to 1.9.x
+	ant.properties["build.compiler"] = "javac1.7"
+
+	ext.aspectjVersion  = "1.7.2"
 	ext.hsqldbVersion   = "1.8.0.10"
 	ext.junitVersion    = "4.11"
 	ext.slf4jVersion    = "1.6.1"
@@ -24,12 +29,12 @@ configure(allprojects) { project ->
 	apply from: "${gradleScriptDir}/ide.gradle"
 
 	compileJava {
-		sourceCompatibility=1.6
-		targetCompatibility=1.6
+		sourceCompatibility=1.5
+		targetCompatibility=1.5
 	}
 	compileTestJava {
-		sourceCompatibility=1.8
-		targetCompatibility=1.8
+		sourceCompatibility=1.7
+		targetCompatibility=1.7
 	}
 
 	[compileJava, compileTestJava]*.options*.compilerArgs = [
@@ -65,7 +70,6 @@ configure(allprojects) { project ->
 
 	repositories {
 		maven { url "http://repo.springsource.org/libs-release" }
-		maven { url "http://maven.springframework.org/milestone" }  // for AspectJ 1.8.0.M1
 	}
 
 	dependencies {
@@ -75,7 +79,7 @@ configure(allprojects) { project ->
 	}
 
 	ext.javadocLinks = [
-		"http://docs.oracle.com/javase/7/docs/api/",
+		"http://docs.oracle.com/javase/6/docs/api/",
 		"http://docs.oracle.com/javaee/6/api/",
 		"http://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/", // CommonJ
 		"http://pic.dhe.ibm.com/infocenter/wasinfo/v7r0/topic/com.ibm.websphere.javadoc.doc/web/apidocs/",
@@ -87,12 +91,14 @@ configure(allprojects) { project ->
 		"http://commons.apache.org/proper/commons-dbcp/apidocs/",
 		"http://portals.apache.org/pluto/portlet-2.0-apidocs/",
 		"http://tiles.apache.org/framework/apidocs/",
+		"http://ibatis.apache.org/docs/java/dev/",
+		"http://hc.apache.org/httpclient-3.x/apidocs/",
 		"http://aopalliance.sourceforge.net/doc/",
 		"http://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/",
 		"http://ehcache.org/apidocs/",
-		"http://quartz-scheduler.org/api/2.1.7/",
-		"http://jackson.codehaus.org/1.9.12/javadoc/",
-		"http://fasterxml.github.com/jackson-core/javadoc/2.2.0/",
+		"http://quartz-scheduler.org/api/2.1.5/",
+		"http://jackson.codehaus.org/1.4.2/javadoc/",
+		"http://fasterxml.github.com/jackson-core/javadoc/2.0.1/",
 	] as String[]
 }
 
@@ -121,7 +127,9 @@ configure(subprojects - project(":spring-build-src")) { subproject ->
 		options.author = true
 		options.header = project.name
 		options.links(project.ext.javadocLinks)
-		options.addStringOption('Xdoclint:none', '-quiet')
+		if(JavaVersion.current().isJava8Compatible()) {
+			options.addStringOption('Xdoclint:none', '-quiet')
+		}
 
 		// suppress warnings due to cross-module @see and @link references;
 		// note that global 'api' task does display all warnings.
@@ -161,17 +169,39 @@ project("spring-build-src") {
 project("spring-core") {
 	description = "Spring Core"
 
-	// As of Spring 4.0, spring-core includes asm 4.1 and repackages cglib 3.0, inlining
-	// both into the spring-core jar. cglib 3.0 itself depends on asm 4, and is therefore
+	// As of Spring 3.2 spring-core repackages both asm 4.0 and cglib 3.0 and inlines both
+	// into the spring-core jar. cglib 3.0 itself depends on asm 4.0, and is therefore
 	// further transformed by the JarJar task to depend on org.springframework.asm; this
-	// avoids including two different copies of asm unnecessarily.
+	// avoids including two different copies of asm unnecessarily. If however future cglib
+	// versions drift from the version of asm used by Spring internally, this duplication
+	// will become necessary.
+	def asmVersion = "4.0"
 	def cglibVersion = "3.0"
 
 	configurations {
 		jarjar
+		asm
 		cglib
 	}
 
+	task asmRepackJar(type: Jar) { repackJar ->
+		repackJar.baseName = "spring-asm-repack"
+		repackJar.version = asmVersion
+
+		doLast() {
+			project.ant {
+				taskdef name: "jarjar", classname: "com.tonicsystems.jarjar.JarJarTask",
+					classpath: configurations.jarjar.asPath
+				jarjar(destfile: repackJar.archivePath) {
+					configurations.asm.each { originalJar ->
+						zipfileset(src: originalJar)
+					}
+					rule(pattern: "org.objectweb.asm.**", result: "org.springframework.asm.@1")
+				}
+			}
+		}
+	}
+
 	task cglibRepackJar(type: Jar) { repackJar ->
 		repackJar.baseName = "spring-cglib-repack"
 		repackJar.version = cglibVersion
@@ -196,13 +226,16 @@ project("spring-core") {
 	}
 
 	dependencies {
+		asm("org.ow2.asm:asm:${asmVersion}@jar")
+		asm("org.ow2.asm:asm-commons:${asmVersion}@jar")
 		cglib("cglib:cglib:${cglibVersion}@jar")
 		jarjar("com.googlecode.jarjar:jarjar:1.3")
 
 		compile(files(cglibRepackJar))
+		compile(files(asmRepackJar))
 		compile("commons-logging:commons-logging:1.1.1")
 		optional("org.aspectj:aspectjweaver:${aspectjVersion}")
-		optional("net.sf.jopt-simple:jopt-simple:4.4")
+		optional("net.sf.jopt-simple:jopt-simple:3.0")
 		optional("log4j:log4j:1.2.17")
 		testCompile("xmlunit:xmlunit:1.3")
 		testCompile("org.codehaus.woodstox:wstx-asl:3.2.7") {
@@ -211,7 +244,11 @@ project("spring-core") {
 	}
 
 	jar {
-		// inline repackaged cglib classes directly into the spring-core jar
+		// inline all repackaged asm and cglib classes directly into the spring-core jar
+		dependsOn asmRepackJar
+		from(zipTree(asmRepackJar.archivePath)) {
+			include "org/springframework/asm/**"
+		}
 		dependsOn cglibRepackJar
 		from(zipTree(cglibRepackJar.archivePath)) {
 			include "org/springframework/cglib/**"
@@ -225,7 +262,7 @@ project("spring-beans") {
 	dependencies {
 		compile(project(":spring-core"))
 		compile(files(project(":spring-core").cglibRepackJar))
-		provided("javax.el:javax.el-api:2.2.4")
+		provided("javax.el:el-api:1.0")
 		provided("javax.inject:javax.inject:1")
 		testCompile("log4j:log4j:1.2.17")
 	}
@@ -283,15 +320,15 @@ project("spring-context") {
 		compile(project(":spring-expression"))
 		compile(project(":spring-core"))
 		compile(files(project(":spring-core").cglibRepackJar))
+		optional("backport-util-concurrent:backport-util-concurrent:3.0")
 		optional("javax.ejb:ejb-api:3.0")
 		optional("javax.inject:javax.inject:1")
-		optional("javax.enterprise.concurrent:javax.enterprise.concurrent-api:1.0-b06")
 		optional("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1")
-		optional("org.eclipse.persistence:javax.persistence:2.0.0")
+		optional("javax.persistence:persistence-api:1.0")
 		optional("org.beanshell:bsh:2.0b4")
-		optional("org.codehaus.groovy:groovy-all:1.8.9")
-		optional("org.jruby:jruby:1.7.2")
-		optional("joda-time:joda-time:2.2")
+		optional("org.codehaus.groovy:groovy-all:1.8.8")
+		optional("org.jruby:jruby:1.6.5.1")
+		optional("joda-time:joda-time:2.1")
 		optional("org.slf4j:slf4j-api:${slf4jVersion}")
 		optional("javax.validation:validation-api:1.0.0.GA")
 		optional("org.hibernate:hibernate-validator:4.3.0.Final")
@@ -309,44 +346,6 @@ project("spring-context") {
 	}
 }
 
-project("spring-messaging") {
-	description = "Spring Messaging"
-
-	dependencies {
-		compile(project(":spring-beans"))
-		compile(project(":spring-core"))
-		compile(project(":spring-context"))
-		optional(project(":spring-websocket"))
-		optional(project(":spring-webmvc"))
-		optional("com.fasterxml.jackson.core:jackson-databind:2.2.0")
-		optional("org.projectreactor:reactor-core:1.0.0.M2")
-		optional("org.projectreactor:reactor-tcp:1.0.0.M2")
-		optional("com.lmax:disruptor:3.1.1")
-		testCompile(project(":spring-test"))
-		testCompile("com.thoughtworks.xstream:xstream:1.4.4")
-		testCompile("commons-dbcp:commons-dbcp:1.2.2")
-		testCompile("javax.inject:javax.inject-tck:1")
-		testCompile("org.apache.activemq:activemq-broker:5.8.0")
-		testCompile("org.apache.activemq:activemq-kahadb-store:5.8.0") {
-			exclude group: "org.springframework", module: "spring-context"
-		}
-		testCompile("org.apache.activemq:activemq-stomp:5.8.0")
-		testCompile("org.eclipse.jetty:jetty-webapp:9.0.5.v20130815") {
-			exclude group: "org.eclipse.jetty.orbit", module: "javax.servlet"
-		}
-		optional("org.eclipse.jetty.websocket:websocket-server:9.0.5.v20130815")
-		optional("org.eclipse.jetty.websocket:websocket-client:9.0.5.v20130815")
-		testCompile("javax.servlet:javax.servlet-api:3.0.1")
-		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
-		testCompile("log4j:log4j:1.2.17")
-}
-
-	repositories {
-		maven { url 'http://repo.springsource.org/libs-milestone' } // reactor
-		maven { url 'http://repo.springsource.org/libs-snapshot' } // reactor
-	}
-}
-
 project("spring-tx") {
 	description = "Spring Transaction"
 
@@ -358,9 +357,9 @@ project("spring-tx") {
 		compile("aopalliance:aopalliance:1.0")
 		provided("com.ibm.websphere:uow:6.0.2.17")
 		optional("javax.resource:connector-api:1.5")
-		optional("javax.transaction:javax.transaction-api:1.2-b03")
+		optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1")
 		optional("javax.ejb:ejb-api:3.0")
-		testCompile("org.eclipse.persistence:javax.persistence:2.0.0")
+		testCompile("javax.persistence:persistence-api:1.0")
 		testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
 	}
 }
@@ -369,12 +368,7 @@ project("spring-oxm") {
 	description = "Spring Object/XML Marshalling"
 	apply from: "oxm.gradle"
 
-    // The following is a work-around until the Gradle build uses
-    // Ant 1.9.x by default. This is necessary to avoid the genCastor
-    // "Class not found: javac1.8" issue with Ant versions prior to 1.9.x
-    ant.properties["build.compiler"] = "javac1.7"
-
-    compileTestJava {
+	compileTestJava {
 		// necessary to avoid java.lang.VerifyError on jibx compilation
 		// see http://jira.codehaus.org/browse/JIBX-465
 		sourceCompatibility=1.6
@@ -385,9 +379,9 @@ project("spring-oxm") {
 		compile(project(":spring-beans"))
 		compile(project(":spring-core"))
 		testCompile(project(":spring-context"))
-		optional("com.thoughtworks.xstream:xstream:1.4.4")
-		optional("org.jibx:jibx-run:1.2.5")
-		optional("org.apache.xmlbeans:xmlbeans:2.6.0")
+		optional("com.thoughtworks.xstream:xstream:1.3.1")
+		optional("org.jibx:jibx-run:1.2.3")
+		optional("org.apache.xmlbeans:xmlbeans:2.4.0")
 		optional("org.codehaus.castor:castor-xml:1.3.2")
 		testCompile("org.codehaus.jettison:jettison:1.0.1")
 		testCompile("xmlunit:xmlunit:1.3")
@@ -412,8 +406,8 @@ project("spring-jms") {
 		provided("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1")
 		optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1")
 		optional("javax.resource:connector-api:1.5")
-		optional("org.codehaus.jackson:jackson-mapper-asl:1.9.12")
-		optional("com.fasterxml.jackson.core:jackson-databind:2.2.0")
+		optional("org.codehaus.jackson:jackson-mapper-asl:1.4.2")
+		optional("com.fasterxml.jackson.core:jackson-databind:2.0.1")
 	}
 }
 
@@ -443,20 +437,18 @@ project("spring-context-support") {
 		compile(project(":spring-context"))
 		optional(project(":spring-jdbc")) // for Quartz support
 		optional(project(":spring-tx")) // for Quartz support
-		optional("javax.mail:mail:1.4.7")
-		optional("javax.cache:cache-api:0.6")
-		optional("net.sf.ehcache:ehcache-core:2.6.5")
-		optional("org.quartz-scheduler:quartz:1.8.6") {
-			exclude group: "org.slf4j", module: "slf4j-log4j12"
-		}
+		optional("javax.mail:mail:1.4")
+		optional("javax.cache:cache-api:0.5")
+		optional("net.sf.ehcache:ehcache-core:2.0.0")
+		optional("opensymphony:quartz:1.6.2")
 		optional("org.codehaus.fabric3.api:commonj:1.1.0")
-		optional("org.apache.velocity:velocity:1.7")
-		optional("org.freemarker:freemarker:2.3.19")
+		optional("velocity:velocity:1.5")
+		optional("org.freemarker:freemarker:2.3.15")
 		optional("com.lowagie:itext:2.1.7")
-		optional("net.sf.jasperreports:jasperreports:5.1.0")
+		optional("jasperreports:jasperreports:2.0.5")
 		optional("org.slf4j:slf4j-api:${slf4jVersion}")
 		provided("javax.activation:activation:1.1")
-		testCompile("org.apache.poi:poi:3.9")
+		testCompile("org.apache.poi:poi:3.0.2-FINAL")
 		testCompile("commons-beanutils:commons-beanutils:1.8.0") // for Velocity/JasperReports
 		testCompile("commons-digester:commons-digester:1.8.1") // for Velocity/JasperReports
 		testCompile("hsqldb:hsqldb:${hsqldbVersion}")
@@ -468,7 +460,6 @@ project("spring-context-support") {
 
 project("spring-web") {
 	description = "Spring Web"
-
 	dependencies {
 		compile(project(":spring-core"))
 		compile(project(":spring-beans")) // for MultiPartFilter
@@ -476,19 +467,22 @@ project("spring-web") {
 		compile(project(":spring-context"))
 		optional(project(":spring-oxm")) // for MarshallingHttpMessageConverter
 		compile("aopalliance:aopalliance:1.0")
-		provided("javax.el:javax.el-api:2.2.4")
-		provided("com.sun.faces:jsf-api:2.1.7")
+		optional("javax.el:el-api:1.0")
+		optional("javax.faces:jsf-api:1.2_08")
 		provided("javax.portlet:portlet-api:2.0")
 		provided("javax.servlet:javax.servlet-api:3.0.1")
 		provided("javax.servlet.jsp:jsp-api:2.1")
+		optional("javax.xml:jaxrpc-api:1.1")
+		provided("javax.xml.soap:saaj-api:1.3")
 		provided("javax.activation:activation:1.1")
-		optional("com.caucho:hessian:4.0.7")
+		optional("com.caucho:hessian:3.2.1")
 		optional("rome:rome:1.0")
-		optional("commons-fileupload:commons-fileupload:1.3")
-		optional("org.apache.httpcomponents:httpclient:4.3-beta2")
-		optional("org.apache.httpcomponents:httpasyncclient:4.0-beta4")
-		optional("org.codehaus.jackson:jackson-mapper-asl:1.9.12")
-		optional("com.fasterxml.jackson.core:jackson-databind:2.2.0")
+		optional("commons-fileupload:commons-fileupload:1.2")
+		optional("commons-io:commons-io:1.3")
+		optional("commons-httpclient:commons-httpclient:3.1")
+		optional("org.apache.httpcomponents:httpclient:4.2")
+		optional("org.codehaus.jackson:jackson-mapper-asl:1.4.2")
+		optional("com.fasterxml.jackson.core:jackson-databind:2.0.1")
 		optional("taglibs:standard:1.1.2")
 		optional("org.eclipse.jetty:jetty-servlet:8.1.5.v20120716") {
 			exclude group: "org.eclipse.jetty.orbit", module: "javax.servlet"
@@ -505,54 +499,34 @@ project("spring-web") {
 	sourceSets.main.resources.srcDirs += "src/main/java"
 }
 
-project("spring-websocket") {
-	description = "Spring WebSocket"
-
-	dependencies {
-		compile(project(":spring-core"))
-		compile(project(":spring-context"))
-		compile(project(":spring-web"))
-		optional(project(":spring-webmvc"))
-		optional("javax.servlet:javax.servlet-api:3.1.0")
-		optional("javax.websocket:javax.websocket-api:1.0")
-		optional("org.apache.tomcat:tomcat-websocket:8.0-SNAPSHOT") {
-			exclude group: "org.apache.tomcat", module: "tomcat-websocket-api"
-			exclude group: "org.apache.tomcat", module: "tomcat-servlet-api"
-		}
-		optional("org.glassfish.tyrus:tyrus-websocket-core:1.2.1")
-		optional("org.glassfish.tyrus:tyrus-container-servlet:1.2.1")
-		optional("org.eclipse.jetty:jetty-webapp:9.0.5.v20130815") {
-			exclude group: "org.eclipse.jetty.orbit", module: "javax.servlet"
-		}
-		optional("org.eclipse.jetty.websocket:websocket-server:9.0.5.v20130815")
-		optional("org.eclipse.jetty.websocket:websocket-client:9.0.5.v20130815")
-		optional("com.fasterxml.jackson.core:jackson-databind:2.2.0")
-		optional("org.codehaus.jackson:jackson-mapper-asl:1.9.12")
-		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
-		testCompile("log4j:log4j:1.2.17")
-	}
-
-	repositories {
-		maven { url "https://repository.apache.org/content/repositories/snapshots" } // tomcat-websocket-* snapshots
-		maven { url "https://maven.java.net/content/repositories/releases" } //  javax.websocket, tyrus
-	}
-}
-
 project("spring-orm") {
 	description = "Spring Object/Relational Mapping"
 
+	compileTestJava {
+		// necessary to avoid java.lang.VerifyError on toplink compilation
+		// TODO: remove this block when we remove toplink
+		sourceCompatibility=1.6
+		targetCompatibility=1.6
+	}
+
 	dependencies {
 		compile("aopalliance:aopalliance:1.0")
-		optional("org.eclipse.persistence:javax.persistence:2.0.0")
-		optional("org.eclipse.persistence:org.eclipse.persistence.core:2.4.0")
-		optional("org.eclipse.persistence:org.eclipse.persistence.jpa:2.4.0")
-		optional("org.hibernate:hibernate-core:3.6.9.Final")
-		optional("org.hibernate:hibernate-entitymanager:3.6.9.Final")
-		optional("org.apache.openjpa:openjpa:2.2.1")
+		optional("javax.persistence:persistence-api:1.0")
+		optional("org.eclipse.persistence:org.eclipse.persistence.core:1.0.1")
+		optional("org.eclipse.persistence:org.eclipse.persistence.jpa:1.0.1")
+		optional("org.hibernate:hibernate-core:3.3.2.GA")
+		optional("org.hibernate:hibernate-annotations:3.4.0.GA")
+		optional("org.hibernate:hibernate-entitymanager:3.4.0.GA")
+		optional("org.apache.openjpa:openjpa:1.1.0")
+		optional("toplink.essentials:toplink-essentials:2.0-41b")
 		optional("javax.jdo:jdo-api:3.0")
-		provided("javax.servlet:javax.servlet-api:3.0.1")
+		optional("org.apache.ibatis:ibatis-sqlmap:2.3.4.726")
+		provided("javax.servlet:servlet-api:2.5")
+		testCompile("javax.servlet:javax.servlet-api:3.0.1")
 		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
 		testCompile("commons-dbcp:commons-dbcp:1.2.2")
+		testCompile("org.eclipse.persistence:org.eclipse.persistence.asm:1.0.1")
+		testCompile("org.eclipse.persistence:org.eclipse.persistence.antlr:1.0.1")
 		testCompile("hsqldb:hsqldb:${hsqldbVersion}")
 		compile(project(":spring-core"))
 		compile(project(":spring-beans"))
@@ -571,10 +545,10 @@ project("spring-orm-hibernate4") {
 	dependencies {
 		provided(project(":spring-tx"))
 		provided(project(":spring-jdbc"))
-		optional("org.hibernate:hibernate-core:4.2.2.Final")
-		optional("org.hibernate:hibernate-entitymanager:4.2.2.Final")
+		optional("org.hibernate:hibernate-core:4.1.9.Final")
+		optional("org.hibernate:hibernate-entitymanager:4.1.9.Final")
 		optional(project(":spring-web"))
-		optional("javax.servlet:javax.servlet-api:3.0.1")
+		optional("javax.servlet:servlet-api:2.5")
 	}
 }
 
@@ -594,17 +568,17 @@ project("spring-webmvc") {
 		optional("org.apache.tiles:tiles-jsp:2.1.2")
 		optional("org.apache.tiles:tiles-servlet:2.1.2")
 		optional("net.sourceforge.jexcelapi:jxl:2.6.3")
-		optional("org.apache.poi:poi:3.9")
+		optional("org.apache.poi:poi:3.0.2-FINAL")
 		optional("com.lowagie:itext:2.1.7")
-		optional("net.sf.jasperreports:jasperreports:5.1.0") {
+		optional("jasperreports:jasperreports:2.0.5") {
 			exclude group: "xml-apis", module: "xml-apis"
 		}
 		optional("rome:rome:1.0")
-		optional("org.apache.velocity:velocity:1.7")
+		optional("velocity:velocity:1.5")
 		optional("velocity-tools:velocity-tools-view:1.4")
-		optional("org.freemarker:freemarker:2.3.19")
-		optional("org.codehaus.jackson:jackson-mapper-asl:1.9.12")
-		optional("com.fasterxml.jackson.core:jackson-databind:2.2.0")
+		optional("org.freemarker:freemarker:2.3.15")
+		optional("org.codehaus.jackson:jackson-mapper-asl:1.4.2")
+		optional("com.fasterxml.jackson.core:jackson-databind:2.0.1")
 		provided("javax.servlet:jstl:1.2")
 		provided("javax.servlet:javax.servlet-api:3.0.1")
 		provided("javax.servlet.jsp:jsp-api:2.1")
@@ -630,7 +604,7 @@ project("spring-webmvc") {
 		testCompile("commons-fileupload:commons-fileupload:1.2")
 		testCompile("commons-io:commons-io:1.3")
 		testCompile("org.hibernate:hibernate-validator:4.3.0.Final")
-		testCompile("org.apache.httpcomponents:httpclient:4.3-beta2")
+		testCompile("org.apache.httpcomponents:httpclient:4.2")
 	}
 
 	// pick up DispatcherServlet.properties in src/main
@@ -644,7 +618,7 @@ project("spring-webmvc-tiles3") {
 	dependencies {
 		provided(project(":spring-context"))
 		provided(project(":spring-web"))
-		provided("javax.el:javax.el-api:2.2.4")
+		provided("javax.el:el-api:1.0")
 		provided("javax.servlet:jstl:1.2")
 		provided("javax.servlet.jsp:jsp-api:2.1")
 		optional("org.apache.tiles:tiles-request-api:1.0.1")
@@ -673,7 +647,7 @@ project("spring-webmvc-portlet") {
 	description = "Spring Web Portlet"
 
 	dependencies {
-		provided("javax.servlet:javax.servlet-api:3.0.1")
+		provided("javax.servlet:servlet-api:2.5")
 		provided("javax.portlet:portlet-api:2.0")
 		compile(project(":spring-core"))
 		compile(project(":spring-beans"))
@@ -701,13 +675,13 @@ project("spring-test") {
 		optional(project(":spring-webmvc"))
 		optional(project(":spring-webmvc-portlet"), )
 		optional("junit:junit:${junitVersion}")
-		optional("org.testng:testng:6.8.5")
-		optional("javax.servlet:javax.servlet-api:3.0.1")
+		optional("org.testng:testng:6.5.2")
+		optional("javax.servlet:servlet-api:2.5")
 		optional("javax.servlet.jsp:jsp-api:2.1")
 		optional("javax.portlet:portlet-api:2.0")
-		optional("org.eclipse.persistence:javax.persistence:2.0.0")
+		optional("javax.persistence:persistence-api:1.0")
 		optional("org.aspectj:aspectjweaver:${aspectjVersion}")
-		testCompile("org.hibernate:hibernate-core:3.6.9.Final")
+		testCompile("org.hibernate:hibernate-core:3.3.2.GA")
 		provided("javax.inject:javax.inject:1")
 		provided("javax.activation:activation:1.1")
 		provided("javax.servlet:jstl:1.2")
@@ -733,12 +707,12 @@ project("spring-test") {
 		// "TestCase" classes are run by other test classes, not the build.
 		exclude(["**/*TestCase.class", "**/*TestSuite.class"])
 	}
+
 }
 
 project("spring-test-mvc") {
 	description = "Spring Test MVC Framework"
 	merge.into = project(":spring-test")
-
 	dependencies {
 		optional(project(":spring-context"))
 		provided(project(":spring-webmvc"))
@@ -749,14 +723,14 @@ project("spring-test-mvc") {
 		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
 		testCompile("javax.servlet:jstl:1.2")
 		testCompile("org.hibernate:hibernate-validator:4.3.0.Final")
-		testCompile("org.codehaus.jackson:jackson-mapper-asl:1.9.12")
-		testCompile("com.fasterxml.jackson.core:jackson-databind:2.2.0")
+		testCompile("org.codehaus.jackson:jackson-mapper-asl:1.4.2")
+		testCompile("com.fasterxml.jackson.core:jackson-databind:2.0.1")
 		testCompile(project(":spring-context-support"))
 		testCompile(project(":spring-oxm"))
-		testCompile("com.thoughtworks.xstream:xstream:1.4.4")
+		testCompile("com.thoughtworks.xstream:xstream:1.3.1")
 		testCompile("rome:rome:1.0")
 		testCompile("javax.activation:activation:1.1")
-		testCompile("javax.mail:mail:1.4.7")
+		testCompile("javax.mail:mail:1.4")
 		testCompile("org.apache.tiles:tiles-request-api:1.0.1")
 		testCompile("org.apache.tiles:tiles-api:3.0.1")
 		testCompile("org.apache.tiles:tiles-core:3.0.1") {
@@ -768,6 +742,22 @@ project("spring-test-mvc") {
 	}
 }
 
+project("spring-struts") {
+	description = "Spring Struts"
+	dependencies {
+		compile(project(":spring-core"))
+		compile(project(":spring-beans"))
+		compile(project(":spring-context"))
+		compile(project(":spring-web"))
+		compile(project(":spring-webmvc"))
+		compile("struts:struts:1.2.9")
+		compile("commons-beanutils:commons-beanutils:1.7.0")
+		provided("javax.servlet:servlet-api:2.5")
+		provided("javax.servlet:jstl:1.2")
+		testCompile(project(":spring-test"))
+	}
+}
+
 project("spring-aspects") {
 	description = "Spring Aspects"
 	apply from: "aspects.gradle"
@@ -780,8 +770,8 @@ project("spring-aspects") {
 		optional(project(":spring-tx")) // for JPA, @Transactional support
 		optional(project(":spring-orm")) // for JPA exception translation support
 		aspects(project(":spring-orm"))
-		provided("org.eclipse.persistence:javax.persistence:2.0.0")
-		testCompile("javax.mail:mail:1.4.7")
+		provided("javax.persistence:persistence-api:1.0")
+		testCompile("javax.mail:mail:1.4")
 		ajc("org.aspectj:aspectjtools:${aspectjVersion}")
 		rt("org.aspectj:aspectjrt:${aspectjVersion}")
 		compile("org.aspectj:aspectjweaver:${aspectjVersion}")
@@ -811,7 +801,7 @@ configure(rootProject) {
 	}
 
 	// TODO: DetectSplitPackagesPlugin fails in line 154 due to method not found on java.io.File.
-	// TODO: Possibly related to user rights or OS differences; passes on local Windows machine.
+	// TODO: Possibly related to user rights or OS differences on OpenJDK 8; works fine on JDK 7.
 	// detectSplitPackages {
 	//	projectsToScan -= project(":spring-instrument-tomcat")
 	// }
@@ -831,8 +821,8 @@ configure(rootProject) {
 		testCompile(project(":spring-web"))
 		testCompile(project(":spring-webmvc-portlet"))
 		testCompile(project(":spring-orm"))
-		testCompile("org.hibernate:hibernate-core:4.2.2.Final")
-		testCompile("javax.servlet:javax.servlet-api:3.0.1")
+		testCompile("org.hibernate:hibernate-core:4.1.9.Final")
+		testCompile("javax.servlet:servlet-api:2.5")
 		testCompile("javax.portlet:portlet-api:2.0")
 		testCompile("javax.inject:javax.inject:1")
 		testCompile("javax.resource:connector-api:1.5")
@@ -857,7 +847,9 @@ configure(rootProject) {
 		options.stylesheetFile = file("src/api/stylesheet.css")
 		options.splitIndex = true
 		options.links(project.ext.javadocLinks)
-		options.addStringOption('Xdoclint:none', '-quiet')
+		if(JavaVersion.current().isJava8Compatible()) {
+			options.addStringOption('Xdoclint:none', '-quiet')
+		}
 
 		source subprojects.collect { project ->
 			project.sourceSets.main.allJava
@@ -868,7 +860,7 @@ configure(rootProject) {
 
 		doFirst {
 			classpath = files(
-				// ensure servlet 3.x and Hibernate 4.x have precedence on the Javadoc
+				// ensure Servlet 3.x and Hibernate 4.x have precedence on the Javadoc
 				// classpath over their respective 2.5 and 3.x variants
 				project(":spring-webmvc").sourceSets.main.compileClasspath.files.find { it =~ "servlet-api" },
 				rootProject.sourceSets.test.compileClasspath.files.find { it =~ "hibernate-core" },
@@ -1008,7 +1000,7 @@ configure(rootProject) {
 		gradleVersion = "1.6"
 
 		doLast() {
-			def gradleOpts = "-XX:MaxMetaspaceSize=1024m -Xmx1024m"
+			def gradleOpts = "-XX:MaxPermSize=1024m -Xmx1024m"
 			def gradleBatOpts = "$gradleOpts -XX:MaxHeapSize=256m"
 			File wrapperFile = file("gradlew")
 			wrapperFile.text = wrapperFile.text.replace("DEFAULT_JVM_OPTS=",

buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy

@@ -34,7 +34,7 @@ import org.gradle.api.invocation.*
  * dependencies (for example Hibernate v3 and v4).
  * <p>
  * The 'merge' extension should be used to define how projects are merged, for example:
- * <pre class="code">
+ * <pre>
  * configure(subprojects) {
  *     apply plugin: MergePlugin
  * }

gradle.properties

@@ -1 +1 @@
-version=4.0.0.M3
+version=3.2.5.RELEASE

gradle/ide.gradle

@@ -5,12 +5,6 @@ import org.gradle.plugins.ide.eclipse.model.SourceFolder
 apply plugin: "propdeps-eclipse"
 apply plugin: "propdeps-idea"
 
-// Until eclipse fully supports Java 8 use 1.7 source level
-eclipse.jdt {
-	sourceCompatibility = 1.7
-	targetCompatibility = 1.7
-}
-
 // Replace classpath entries with project dependencies (GRADLE-1116)
 eclipse.classpath.file.whenMerged { classpath ->
 	def regexp = /.*?\/([^\/]+)\/build\/[^\/]+\/(?:main|test)/ // only match those that end in main or test (avoids removing necessary entries like build/classes/jaxb)

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon May 13 17:38:05 CDT 2013
-zipStorePath=wrapper/dists
+#Tue Jul 30 09:29:28 PDT 2013
 zipStoreBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionBase=GRADLE_USER_HOME
 distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip
+distributionPath=wrapper/dists
+zipStorePath=wrapper/dists
+distributionBase=GRADLE_USER_HOME

gradlew

@@ -7,7 +7,7 @@
 ##############################################################################
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-GRADLE_OPTS="-XX:MaxMetaspaceSize=1024m -Xmx1024m $GRADLE_OPTS"
+GRADLE_OPTS="-XX:MaxPermSize=1024m -Xmx1024m $GRADLE_OPTS"
 DEFAULT_JVM_OPTS=""
 
 APP_NAME="Gradle"

gradlew.bat

@@ -9,7 +9,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set GRADLE_OPTS=-XX:MaxMetaspaceSize=1024m -Xmx1024m -XX:MaxHeapSize=256m %GRADLE_OPTS%
+set GRADLE_OPTS=-XX:MaxPermSize=1024m -Xmx1024m -XX:MaxHeapSize=256m %GRADLE_OPTS%
 set DEFAULT_JVM_OPTS=
 
 set DIRNAME=%~dp0

settings.gradle

@@ -11,10 +11,10 @@ include "spring-instrument"
 include "spring-instrument-tomcat"
 include "spring-jdbc"
 include "spring-jms"
-include "spring-messaging"
 include "spring-orm"
 include "spring-orm-hibernate4"
 include "spring-oxm"
+include "spring-struts"
 include "spring-test"
 include "spring-test-mvc"
 include "spring-tx"
@@ -22,7 +22,6 @@ include "spring-web"
 include "spring-webmvc"
 include "spring-webmvc-portlet"
 include "spring-webmvc-tiles3"
-include "spring-websocket"
 
 // Exposes gradle buildSrc for IDE support
 include "buildSrc"

spring-aop/src/main/java/org/springframework/aop/TargetSource.java

@@ -39,7 +39,6 @@ public interface TargetSource extends TargetClassAware {
 	 * target class.
 	 * @return the type of targets returned by this {@link TargetSource}
 	 */
-	@Override
 	Class<?> getTargetClass();
 
 	/**

spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java

@@ -34,7 +34,6 @@ class TrueClassFilter implements ClassFilter, Serializable {
 	private TrueClassFilter() {
 	}
 
-	@Override
 	public boolean matches(Class clazz) {
 		return true;
 	}

spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java

@@ -35,17 +35,14 @@ class TrueMethodMatcher implements MethodMatcher, Serializable {
 	private TrueMethodMatcher() {
 	}
 
-	@Override
 	public boolean isRuntime() {
 		return false;
 	}
 
-	@Override
 	public boolean matches(Method method, Class targetClass) {
 		return true;
 	}
 
-	@Override
 	public boolean matches(Method method, Class targetClass, Object[] args) {
 		// Should never be invoked as isRuntime returns false.
 		throw new UnsupportedOperationException();

spring-aop/src/main/java/org/springframework/aop/TruePointcut.java

@@ -34,12 +34,10 @@ class TruePointcut implements Pointcut, Serializable {
 	private TruePointcut() {
 	}
 
-	@Override
 	public ClassFilter getClassFilter() {
 		return ClassFilter.TRUE;
 	}
 
-	@Override
 	public MethodMatcher getMethodMatcher() {
 		return MethodMatcher.TRUE;
 	}

spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,8 +37,9 @@ import org.springframework.aop.interceptor.ExposeInvocationInterceptor;
 import org.springframework.aop.support.ComposablePointcut;
 import org.springframework.aop.support.MethodMatchers;
 import org.springframework.aop.support.StaticMethodMatcher;
-import org.springframework.core.DefaultParameterNameDiscoverer;
+import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
 import org.springframework.core.ParameterNameDiscoverer;
+import org.springframework.core.PrioritizedParameterNameDiscoverer;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.CollectionUtils;
@@ -202,7 +203,6 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 		return this.aspectInstanceFactory.getAspectClassLoader();
 	}
 
-	@Override
 	public int getOrder() {
 		return this.aspectInstanceFactory.getOrder();
 	}
@@ -212,7 +212,6 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 		this.aspectName = name;
 	}
 
-	@Override
 	public String getAspectName() {
 		return this.aspectName;
 	}
@@ -224,7 +223,6 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 		this.declarationOrder = order;
 	}
 
-	@Override
 	public int getDeclarationOrder() {
 		return this.declarationOrder;
 	}
@@ -434,13 +432,15 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 
 	/**
 	 * Create a ParameterNameDiscoverer to be used for argument binding.
-	 * <p>The default implementation creates a {@link DefaultParameterNameDiscoverer}
-	 * and adds a specifically configured {@link AspectJAdviceParameterNameDiscoverer}.
+	 * <p>The default implementation creates a {@link PrioritizedParameterNameDiscoverer}
+	 * containing a {@link LocalVariableTableParameterNameDiscoverer} and an
+	 * {@link AspectJAdviceParameterNameDiscoverer}.
 	 */
 	protected ParameterNameDiscoverer createParameterNameDiscoverer() {
 		// We need to discover them, or if that fails, guess,
 		// and if we can't guess with 100% accuracy, fail.
-		DefaultParameterNameDiscoverer discoverer = new DefaultParameterNameDiscoverer();
+		PrioritizedParameterNameDiscoverer discoverer = new PrioritizedParameterNameDiscoverer();
+		discoverer.addDiscoverer(new LocalVariableTableParameterNameDiscoverer());
 		AspectJAdviceParameterNameDiscoverer adviceParameterNameDiscoverer =
 				new AspectJAdviceParameterNameDiscoverer(this.pointcut.getExpression());
 		adviceParameterNameDiscoverer.setReturningName(this.returningName);
@@ -678,7 +678,6 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 			this.adviceMethod = adviceMethod;
 		}
 
-		@Override
 		public boolean matches(Method method, Class targetClass) {
 			return !this.adviceMethod.equals(method);
 		}

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java

@@ -222,7 +222,6 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 	 * @param method the target {@link Method}
 	 * @return the parameter names
 	 */
-	@Override
 	public String[] getParameterNames(Method method) {
 		this.argumentTypes = method.getParameterTypes();
 		this.numberOfRemainingUnboundArguments = this.argumentTypes.length;
@@ -310,7 +309,6 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 	 * @throws UnsupportedOperationException if
 	 * {@link #setRaiseExceptions(boolean) raiseExceptions} has been set to {@code true}
 	 */
-	@Override
 	public String[] getParameterNames(Constructor ctor) {
 		if (this.raiseExceptions) {
 			throw new UnsupportedOperationException("An advice method can never be a constructor");

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterAdvice.java

@@ -37,7 +37,6 @@ public class AspectJAfterAdvice extends AbstractAspectJAdvice implements MethodI
 		super(aspectJBeforeAdviceMethod, pointcut, aif);
 	}
 
-	@Override
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		try {
 			return mi.proceed();
@@ -47,12 +46,10 @@ public class AspectJAfterAdvice extends AbstractAspectJAdvice implements MethodI
 		}
 	}
 
-	@Override
 	public boolean isBeforeAdvice() {
 		return false;
 	}
 
-	@Override
 	public boolean isAfterAdvice() {
 		return true;
 	}

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterReturningAdvice.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2010 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,12 +40,10 @@ public class AspectJAfterReturningAdvice extends AbstractAspectJAdvice implement
 		super(aspectJBeforeAdviceMethod, pointcut, aif);
 	}
 
-	@Override
 	public boolean isBeforeAdvice() {
 		return false;
 	}
 
-	@Override
 	public boolean isAfterAdvice() {
 		return true;
 	}
@@ -55,7 +53,6 @@ public class AspectJAfterReturningAdvice extends AbstractAspectJAdvice implement
 		setReturningNameNoCheck(name);
 	}
 
-	@Override
 	public void afterReturning(Object returnValue, Method method, Object[] args, Object target) throws Throwable {
 		if (shouldInvokeOnReturnValueOf(method, returnValue)) {
 			invokeAdviceMethod(getJoinPointMatch(), returnValue, null);

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterThrowingAdvice.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2007 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,12 +37,10 @@ public class AspectJAfterThrowingAdvice extends AbstractAspectJAdvice implements
 		super(aspectJBeforeAdviceMethod, pointcut, aif);
 	}
 
-	@Override
 	public boolean isBeforeAdvice() {
 		return false;
 	}
 
-	@Override
 	public boolean isAfterAdvice() {
 		return true;
 	}
@@ -52,7 +50,6 @@ public class AspectJAfterThrowingAdvice extends AbstractAspectJAdvice implements
 		setThrowingNameNoCheck(name);
 	}
 
-	@Override
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		try {
 			return mi.proceed();

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAroundAdvice.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2007 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,12 +41,10 @@ public class AspectJAroundAdvice extends AbstractAspectJAdvice implements Method
 		super(aspectJAroundAdviceMethod, pointcut, aif);
 	}
 
-	@Override
 	public boolean isBeforeAdvice() {
 		return false;
 	}
 
-	@Override
 	public boolean isAfterAdvice() {
 		return false;
 	}
@@ -57,7 +55,6 @@ public class AspectJAroundAdvice extends AbstractAspectJAdvice implements Method
 	}
 
 
-	@Override
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		if (!(mi instanceof ProxyMethodInvocation)) {
 			throw new IllegalStateException("MethodInvocation is not a Spring ProxyMethodInvocation: " + mi);

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java

@@ -155,19 +155,16 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 		this.pointcutParameterTypes = types;
 	}
 
-	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
 
 
-	@Override
 	public ClassFilter getClassFilter() {
 		checkReadyToMatch();
 		return this;
 	}
 
-	@Override
 	public MethodMatcher getMethodMatcher() {
 		checkReadyToMatch();
 		return this;
@@ -247,7 +244,6 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 		return this.pointcutExpression;
 	}
 
-	@Override
 	public boolean matches(Class targetClass) {
 		checkReadyToMatch();
 		try {
@@ -271,7 +267,6 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 		}
 	}
 
-	@Override
 	public boolean matches(Method method, Class targetClass, boolean beanHasIntroductions) {
 		checkReadyToMatch();
 		Method targetMethod = AopUtils.getMostSpecificMethod(method, targetClass);
@@ -292,18 +287,15 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 		}
 	}
 
-	@Override
 	public boolean matches(Method method, Class targetClass) {
 		return matches(method, targetClass, false);
 	}
 
-	@Override
 	public boolean isRuntime() {
 		checkReadyToMatch();
 		return this.pointcutExpression.mayNeedDynamicTest();
 	}
 
-	@Override
 	public boolean matches(Method method, Class targetClass, Object[] args) {
 		checkReadyToMatch();
 		ShadowMatch shadowMatch = getShadowMatch(AopUtils.getMostSpecificMethod(method, targetClass), method);
@@ -514,12 +506,10 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 
 		private static final String BEAN_DESIGNATOR_NAME = "bean";
 
-		@Override
 		public String getDesignatorName() {
 			return BEAN_DESIGNATOR_NAME;
 		}
 
-		@Override
 		public ContextBasedMatcher parse(String expression) {
 			return new BeanNameContextMatcher(expression);
 		}
@@ -541,27 +531,22 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 			this.expressionPattern = new NamePattern(expression);
 		}
 
-		@Override
 		public boolean couldMatchJoinPointsInType(Class someClass) {
 			return (contextMatch(someClass) == FuzzyBoolean.YES);
 		}
 
-		@Override
 		public boolean couldMatchJoinPointsInType(Class someClass, MatchingContext context) {
 			return (contextMatch(someClass) == FuzzyBoolean.YES);
 		}
 
-		@Override
 		public boolean matchesDynamically(MatchingContext context) {
 			return true;
 		}
 
-		@Override
 		public FuzzyBoolean matchesStatically(MatchingContext context) {
 			return contextMatch(null);
 		}
 
-		@Override
 		public boolean mayNeedDynamicTest() {
 			return false;
 		}
@@ -626,22 +611,18 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 			this.other = other;
 		}
 
-		@Override
 		public boolean alwaysMatches() {
 			return primary.alwaysMatches();
 		}
 
-		@Override
 		public boolean maybeMatches() {
 			return primary.maybeMatches();
 		}
 
-		@Override
 		public boolean neverMatches() {
 			return primary.neverMatches();
 		}
 
-		@Override
 		public JoinPointMatch matchesJoinPoint(Object thisObject,
 				Object targetObject, Object[] args) {
 			try {
@@ -651,7 +632,6 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 			}
 		}
 
-		@Override
 		public void setMatchingContext(MatchingContext aMatchContext) {
 			primary.setMatchingContext(aMatchContext);
 			other.setMatchingContext(aMatchContext);

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisor.java

@@ -31,7 +31,6 @@ public class AspectJExpressionPointcutAdvisor extends AbstractGenericPointcutAdv
 	private final AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();
 
 
-	@Override
 	public Pointcut getPointcut() {
 		return this.pointcut;
 	}

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJMethodBeforeAdvice.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2006 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,17 +35,14 @@ public class AspectJMethodBeforeAdvice extends AbstractAspectJAdvice implements
 		super(aspectJBeforeAdviceMethod, pointcut, aif);
 	}
 
-	@Override
 	public void before(Method method, Object[] args, Object target) throws Throwable {
 		invokeAdviceMethod(getJoinPointMatch(), null, null);
 	}
 
-	@Override
 	public boolean isBeforeAdvice() {
 		return true;
 	}
 
-	@Override
 	public boolean isAfterAdvice() {
 		return false;
 	}

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2008 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,22 +56,18 @@ public class AspectJPointcutAdvisor implements PointcutAdvisor, Ordered {
 	}
 
 
-	@Override
 	public boolean isPerInstance() {
 		return true;
 	}
 
-	@Override
 	public Advice getAdvice() {
 		return this.advice;
 	}
 
-	@Override
 	public Pointcut getPointcut() {
 		return this.pointcut;
 	}
 
-	@Override
 	public int getOrder() {
 		if (this.order != null) {
 			return this.order;

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJWeaverMessageHandler.java

@@ -48,7 +48,6 @@ public class AspectJWeaverMessageHandler implements IMessageHandler {
 	private static final Log logger = LogFactory.getLog("AspectJ Weaver");
 
 
-	@Override
 	public boolean handleMessage(IMessage message) throws AbortException {
 		Kind messageKind = message.getKind();
 		if (messageKind == IMessage.DEBUG) {
@@ -88,18 +87,15 @@ public class AspectJWeaverMessageHandler implements IMessageHandler {
 		return AJ_ID + aMessage.getMessage();
 	}
 
-	@Override
 	public boolean isIgnoring(Kind messageKind) {
 		// We want to see everything, and allow configuration of log levels dynamically.
 		return false;
 	}
 
-	@Override
 	public void dontIgnore(Kind messageKind) {
 		// We weren't ignoring anything anyway...
 	}
 
-	@Override
 	public void ignore(Kind kind) {
 		// We weren't ignoring anything anyway...
 	}

spring-aop/src/main/java/org/springframework/aop/aspectj/DeclareParentsAdvisor.java

@@ -77,7 +77,6 @@ public class DeclareParentsAdvisor implements IntroductionAdvisor {
 
 		// Excludes methods implemented.
 		ClassFilter exclusion = new ClassFilter() {
-			@Override
 			public boolean matches(Class clazz) {
 				return !(introducedInterface.isAssignableFrom(clazz));
 			}
@@ -88,27 +87,22 @@ public class DeclareParentsAdvisor implements IntroductionAdvisor {
 	}
 
 
-	@Override
 	public ClassFilter getClassFilter() {
 		return this.typePatternClassFilter;
 	}
 
-	@Override
 	public void validateInterfaces() throws IllegalArgumentException {
 		// Do nothing
 	}
 
-	@Override
 	public boolean isPerInstance() {
 		return true;
 	}
 
-	@Override
 	public Advice getAdvice() {
 		return this.advice;
 	}
 
-	@Override
 	public Class[] getInterfaces() {
 		return new Class[] {this.introducedInterface};
 	}

spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java

@@ -27,8 +27,7 @@ import org.aspectj.lang.reflect.SourceLocation;
 import org.aspectj.runtime.internal.AroundClosure;
 
 import org.springframework.aop.ProxyMethodInvocation;
-import org.springframework.core.DefaultParameterNameDiscoverer;
-import org.springframework.core.ParameterNameDiscoverer;
+import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
 import org.springframework.util.Assert;
 
 /**
@@ -52,8 +51,6 @@ import org.springframework.util.Assert;
  */
 public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint, JoinPoint.StaticPart {
 
-	private static final ParameterNameDiscoverer parameterNameDiscoverer = new DefaultParameterNameDiscoverer();
-
 	private final ProxyMethodInvocation methodInvocation;
 
 	private Object[] defensiveCopyOfArgs;
@@ -75,17 +72,14 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint,
 		this.methodInvocation = methodInvocation;
 	}
 
-	@Override
 	public void set$AroundClosure(AroundClosure aroundClosure) {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
 	public Object proceed() throws Throwable {
 		return this.methodInvocation.invocableClone().proceed();
 	}
 
-	@Override
 	public Object proceed(Object[] arguments) throws Throwable {
 		Assert.notNull(arguments, "Argument array passed to proceed cannot be null");
 		if (arguments.length != this.methodInvocation.getArguments().length) {
@@ -100,7 +94,6 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint,
 	/**
 	 * Returns the Spring AOP proxy. Cannot be {@code null}.
 	 */
-	@Override
 	public Object getThis() {
 		return this.methodInvocation.getProxy();
 	}
@@ -108,12 +101,10 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint,
 	/**
 	 * Returns the Spring AOP target. May be {@code null} if there is no target.
 	 */
-	@Override
 	public Object getTarget() {
 		return this.methodInvocation.getThis();
 	}
 
-	@Override
 	public Object[] getArgs() {
 		if (this.defensiveCopyOfArgs == null) {
 			Object[] argsSource = this.methodInvocation.getArguments();
@@ -123,7 +114,6 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint,
 		return this.defensiveCopyOfArgs;
 	}
 
-	@Override
 	public Signature getSignature() {
 		if (this.signature == null) {
 			this.signature = new MethodSignatureImpl();
@@ -131,7 +121,6 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint,
 		return signature;
 	}
 
-	@Override
 	public SourceLocation getSourceLocation() {
 		if (this.sourceLocation == null) {
 			this.sourceLocation = new SourceLocationImpl();
@@ -139,33 +128,27 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint,
 		return this.sourceLocation;
 	}
 
-	@Override
 	public String getKind() {
 		return ProceedingJoinPoint.METHOD_EXECUTION;
 	}
 
-	@Override
 	public int getId() {
 		// TODO: It's just an adapter but returning 0 might still have side effects...
 		return 0;
 	}
 
-	@Override
 	public JoinPoint.StaticPart getStaticPart() {
 		return this;
 	}
 
-	@Override
 	public String toShortString() {
 		return "execution(" + getSignature().toShortString() + ")";
 	}
 
-	@Override
 	public String toLongString() {
 		return "execution(" + getSignature().toLongString() + ")";
 	}
 
-	@Override
 	public String toString() {
 		return "execution(" + getSignature().toString() + ")";
 	}
@@ -178,65 +161,53 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint,
 
 		private volatile String[] parameterNames;
 
-		@Override
 		public String getName() {
 			return methodInvocation.getMethod().getName();
 		}
 
-		@Override
 		public int getModifiers() {
 			return methodInvocation.getMethod().getModifiers();
 		}
 
-		@Override
 		public Class getDeclaringType() {
 			return methodInvocation.getMethod().getDeclaringClass();
 		}
 
-		@Override
 		public String getDeclaringTypeName() {
 			return methodInvocation.getMethod().getDeclaringClass().getName();
 		}
 
-		@Override
 		public Class getReturnType() {
 			return methodInvocation.getMethod().getReturnType();
 		}
 
-		@Override
 		public Method getMethod() {
 			return methodInvocation.getMethod();
 		}
 
-		@Override
 		public Class[] getParameterTypes() {
 			return methodInvocation.getMethod().getParameterTypes();
 		}
 
-		@Override
 		public String[] getParameterNames() {
 			if (this.parameterNames == null) {
-				this.parameterNames = parameterNameDiscoverer.getParameterNames(getMethod());
+				this.parameterNames = (new LocalVariableTableParameterNameDiscoverer()).getParameterNames(getMethod());
 			}
 			return this.parameterNames;
 		}
 
-		@Override
 		public Class[] getExceptionTypes() {
 			return methodInvocation.getMethod().getExceptionTypes();
 		}
 
-		@Override
 		public String toShortString() {
 			return toString(false, false, false, false);
 		}
 
-		@Override
 		public String toLongString() {
 			return toString(true, true, true, true);
 		}
 
-		@Override
 		public String toString() {
 			return toString(false, true, false, true);
 		}
@@ -296,7 +267,6 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint,
 	 */
 	private class SourceLocationImpl implements SourceLocation {
 
-		@Override
 		public Class getWithinType() {
 			if (methodInvocation.getThis() == null) {
 				throw new UnsupportedOperationException("No source location joinpoint available: target is null");
@@ -304,17 +274,14 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint,
 			return methodInvocation.getThis().getClass();
 		}
 
-		@Override
 		public String getFileName() {
 			throw new UnsupportedOperationException();
 		}
 
-		@Override
 		public int getLine() {
 			throw new UnsupportedOperationException();
 		}
 
-		@Override
 		public int getColumn() {
 			throw new UnsupportedOperationException();
 		}

spring-aop/src/main/java/org/springframework/aop/aspectj/RuntimeTestWalker.java

@@ -106,44 +106,35 @@ class RuntimeTestWalker {
 		protected static final int AT_TARGET_VAR = 4;
 		protected static final int AT_ANNOTATION_VAR = 8;
 
-		@Override
 		public void visit(And e) {
 			e.getLeft().accept(this);
 			e.getRight().accept(this);
 		}
 
-		@Override
 		public void visit(Or e) {
 			e.getLeft().accept(this);
 			e.getRight().accept(this);
 		}
 
-		@Override
 		public void visit(Not e) {
 			e.getBody().accept(this);
 		}
 
-		@Override
 		public void visit(Instanceof i) {
 		}
 
-		@Override
 		public void visit(Literal literal) {
 		}
 
-		@Override
 		public void visit(Call call) {
 		}
 
-		@Override
 		public void visit(FieldGetCall fieldGetCall) {
 		}
 
-		@Override
 		public void visit(HasAnnotation hasAnnotation) {
 		}
 
-		@Override
 		public void visit(MatchingContextBasedTest matchingContextTest) {
 		}
 

spring-aop/src/main/java/org/springframework/aop/aspectj/SimpleAspectInstanceFactory.java

@@ -49,7 +49,6 @@ public class SimpleAspectInstanceFactory implements AspectInstanceFactory {
 	}
 
 
-	@Override
 	public final Object getAspectInstance() {
 		try {
 			return this.aspectClass.newInstance();
@@ -62,7 +61,6 @@ public class SimpleAspectInstanceFactory implements AspectInstanceFactory {
 		}
 	}
 
-	@Override
 	public ClassLoader getAspectClassLoader() {
 		return this.aspectClass.getClassLoader();
 	}
@@ -75,7 +73,6 @@ public class SimpleAspectInstanceFactory implements AspectInstanceFactory {
 	 * @see org.springframework.core.Ordered
 	 * @see #getOrderForAspectClass
 	 */
-	@Override
 	public int getOrder() {
 		return getOrderForAspectClass(this.aspectClass);
 	}

spring-aop/src/main/java/org/springframework/aop/aspectj/SingletonAspectInstanceFactory.java

@@ -44,12 +44,10 @@ public class SingletonAspectInstanceFactory implements AspectInstanceFactory {
 	}
 
 
-	@Override
 	public final Object getAspectInstance() {
 		return this.aspectInstance;
 	}
 
-	@Override
 	public ClassLoader getAspectClassLoader() {
 		return this.aspectInstance.getClass().getClassLoader();
 	}
@@ -62,7 +60,6 @@ public class SingletonAspectInstanceFactory implements AspectInstanceFactory {
 	 * @see org.springframework.core.Ordered
 	 * @see #getOrderForAspectClass
 	 */
-	@Override
 	public int getOrder() {
 		if (this.aspectInstance instanceof Ordered) {
 			return ((Ordered) this.aspectInstance).getOrder();

spring-aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java

@@ -93,7 +93,6 @@ public class TypePatternClassFilter implements ClassFilter {
 	 * @return whether the advice should apply to this candidate target class
 	 * @throws IllegalStateException if no {@link #setTypePattern(String)} has been set
 	 */
-	@Override
 	public boolean matches(Class clazz) {
 		if (this.aspectJTypePatternMatcher == null) {
 			throw new IllegalStateException("No 'typePattern' has been set via ctor/setter.");

spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,6 +59,9 @@ import org.springframework.util.StringUtils;
  */
 public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFactory {
 
+	protected static final ParameterNameDiscoverer ASPECTJ_ANNOTATION_PARAMETER_NAME_DISCOVERER =
+			new AspectJAnnotationParameterNameDiscoverer();
+
 	private static final String AJC_MAGIC = "ajc$";
 
 
@@ -93,16 +96,21 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
 	/** Logger available to subclasses */
 	protected final Log logger = LogFactory.getLog(getClass());
 
-	protected final ParameterNameDiscoverer parameterNameDiscoverer = new AspectJAnnotationParameterNameDiscoverer();
+	protected final ParameterNameDiscoverer parameterNameDiscoverer;
 
 
+	protected AbstractAspectJAdvisorFactory() {
+		PrioritizedParameterNameDiscoverer prioritizedParameterNameDiscoverer = new PrioritizedParameterNameDiscoverer();
+		prioritizedParameterNameDiscoverer.addDiscoverer(ASPECTJ_ANNOTATION_PARAMETER_NAME_DISCOVERER);
+		this.parameterNameDiscoverer = prioritizedParameterNameDiscoverer;
+	}
+
 	/**
 	 * We consider something to be an AspectJ aspect suitable for use by the Spring AOP system
 	 * if it has the @Aspect annotation, and was not compiled by ajc. The reason for this latter test
 	 * is that aspects written in the code-style (AspectJ language) also have the annotation present
 	 * when compiled by ajc with the -1.5 flag, yet they cannot be consumed by Spring AOP.
 	 */
-	@Override
 	public boolean isAspect(Class<?> clazz) {
 		return (hasAspectAnnotation(clazz) && !compiledByAjc(clazz));
 	}
@@ -127,7 +135,6 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
 		return false;
 	}
 
-	@Override
 	public void validate(Class<?> aspectClass) throws AopConfigException {
 		// If the parent has the annotation and isn't abstract it's an error
 		if (aspectClass.getSuperclass().getAnnotation(Aspect.class) != null &&
@@ -302,7 +309,6 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
 	 */
 	private static class AspectJAnnotationParameterNameDiscoverer implements ParameterNameDiscoverer {
 
-		@Override
 		public String[] getParameterNames(Method method) {
 			if (method.getParameterTypes().length == 0) {
 				return new String[0];
@@ -324,7 +330,6 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
 			}
 		}
 
-		@Override
 		public String[] getParameterNames(Constructor ctor) {
 			throw new UnsupportedOperationException("Spring AOP cannot handle constructor advice");
 		}

spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/BeanFactoryAspectInstanceFactory.java

@@ -73,12 +73,10 @@ public class BeanFactoryAspectInstanceFactory implements MetadataAwareAspectInst
 	}
 
 
-	@Override
 	public Object getAspectInstance() {
 		return this.beanFactory.getBean(this.name);
 	}
 
-	@Override
 	public ClassLoader getAspectClassLoader() {
 		if (this.beanFactory instanceof ConfigurableBeanFactory) {
 			return ((ConfigurableBeanFactory) this.beanFactory).getBeanClassLoader();
@@ -88,7 +86,6 @@ public class BeanFactoryAspectInstanceFactory implements MetadataAwareAspectInst
 		}
 	}
 
-	@Override
 	public AspectMetadata getAspectMetadata() {
 		return this.aspectMetadata;
 	}
@@ -103,7 +100,6 @@ public class BeanFactoryAspectInstanceFactory implements MetadataAwareAspectInst
 	 * @see org.springframework.core.Ordered
 	 * @see org.springframework.core.annotation.Order
 	 */
-	@Override
 	public int getOrder() {
 		Class<?> type = this.beanFactory.getType(this.name);
 		if (type != null) {

spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java

@@ -97,7 +97,6 @@ class InstantiationModelAwarePointcutAdvisorImpl
 	 * The pointcut for Spring AOP to use. Actual behaviour of the pointcut will change
 	 * depending on the state of the advice.
 	 */
-	@Override
 	public Pointcut getPointcut() {
 		return this.pointcut;
 	}
@@ -107,7 +106,6 @@ class InstantiationModelAwarePointcutAdvisorImpl
 	 * are much richer. In AspectJ terminology, all a return of {@code true}
 	 * means here is that the aspect is not a SINGLETON.
 	 */
-	@Override
 	public boolean isPerInstance() {
 		return (getAspectMetadata().getAjType().getPerClause().getKind() != PerClauseKind.SINGLETON);
 	}
@@ -122,7 +120,6 @@ class InstantiationModelAwarePointcutAdvisorImpl
 	/**
 	 * Lazily instantiate advice if necessary.
 	 */
-	@Override
 	public synchronized Advice getAdvice() {
 		if (this.instantiatedAdvice == null) {
 			this.instantiatedAdvice = instantiateAdvice(this.declaredPointcut);
@@ -130,12 +127,10 @@ class InstantiationModelAwarePointcutAdvisorImpl
 		return this.instantiatedAdvice;
 	}
 
-	@Override
 	public boolean isLazy() {
 		return this.lazy;
 	}
 
-	@Override
 	public synchronized boolean isAdviceInstantiated() {
 		return (this.instantiatedAdvice != null);
 	}
@@ -154,22 +149,18 @@ class InstantiationModelAwarePointcutAdvisorImpl
 		return this.declaredPointcut;
 	}
 
-	@Override
 	public int getOrder() {
 		return this.aspectInstanceFactory.getOrder();
 	}
 
-	@Override
 	public String getAspectName() {
 		return this.aspectName;
 	}
 
-	@Override
 	public int getDeclarationOrder() {
 		return this.declarationOrder;
 	}
 
-	@Override
 	public boolean isBeforeAdvice() {
 		if (this.isBeforeAdvice == null) {
 			determineAdviceType();
@@ -177,7 +168,6 @@ class InstantiationModelAwarePointcutAdvisorImpl
 		return this.isBeforeAdvice;
 	}
 
-	@Override
 	public boolean isAfterAdvice() {
 		if (this.isAfterAdvice == null) {
 			determineAdviceType();
@@ -255,7 +245,6 @@ class InstantiationModelAwarePointcutAdvisorImpl
 					this.preInstantiationPointcut.getMethodMatcher().matches(method, targetClass);
 		}
 
-		@Override
 		public boolean matches(Method method, Class targetClass, Object[] args) {
 			// This can match only on declared pointcut.
 			return (isAspectMaterialized() && this.declaredPointcut.matches(method, targetClass));

spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/LazySingletonAspectInstanceFactoryDecorator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2009 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,6 @@ public class LazySingletonAspectInstanceFactoryDecorator implements MetadataAwar
 	}
 
 
-	@Override
 	public synchronized Object getAspectInstance() {
 		if (this.materialized == null) {
 			synchronized (this) {
@@ -58,17 +57,14 @@ public class LazySingletonAspectInstanceFactoryDecorator implements MetadataAwar
 		return (this.materialized != null);
 	}
 
-	@Override
 	public ClassLoader getAspectClassLoader() {
 		return this.maaif.getAspectClassLoader();
 	}
 
-	@Override
 	public AspectMetadata getAspectMetadata() {
 		return this.maaif.getAspectMetadata();
 	}
 
-	@Override
 	public int getOrder() {
 		return this.maaif.getOrder();
 	}

spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java

@@ -75,7 +75,6 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 				new InstanceComparator<Annotation>(
 						Around.class, Before.class, After.class, AfterReturning.class, AfterThrowing.class),
 				new Converter<Method, Annotation>() {
-					@Override
 					public Annotation convert(Method method) {
 						AspectJAnnotation<?> annotation = AbstractAspectJAdvisorFactory.findAspectJAnnotationOnMethod(method);
 						return annotation == null ? null : annotation.getAnnotation();
@@ -83,7 +82,6 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 				}));
 		comparator.addComparator(new ConvertingComparator<Method, String>(
 				new Converter<Method, String>() {
-					@Override
 					public String convert(Method method) {
 						return method.getName();
 					}
@@ -92,7 +90,6 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 	}
 
 
-	@Override
 	public List<Advisor> getAdvisors(MetadataAwareAspectInstanceFactory maaif) {
 		final Class<?> aspectClass = maaif.getAspectMetadata().getAspectClass();
 		final String aspectName = maaif.getAspectMetadata().getAspectName();
@@ -131,7 +128,6 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 	private List<Method> getAdvisorMethods(Class<?> aspectClass) {
 		final List<Method> methods = new LinkedList<Method>();
 		ReflectionUtils.doWithMethods(aspectClass, new ReflectionUtils.MethodCallback() {
-			@Override
 			public void doWith(Method method) throws IllegalArgumentException {
 				// Exclude pointcuts
 				if (AnnotationUtils.getAnnotation(method, Pointcut.class) == null) {
@@ -168,7 +164,6 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 	}
 
 
-	@Override
 	public Advisor getAdvisor(Method candidateAdviceMethod, MetadataAwareAspectInstanceFactory aif,
 			int declarationOrderInAspect, String aspectName) {
 
@@ -196,7 +191,6 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 	}
 
 
-	@Override
 	public Advice getAdvice(Method candidateAdviceMethod, AspectJExpressionPointcut ajexp,
 			MetadataAwareAspectInstanceFactory aif, int declarationOrderInAspect, String aspectName) {
 
@@ -278,7 +272,6 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 
 		public SyntheticInstantiationAdvisor(final MetadataAwareAspectInstanceFactory aif) {
 			super(aif.getAspectMetadata().getPerClausePointcut(), new MethodBeforeAdvice() {
-				@Override
 				public void before(Method method, Object[] args, Object target) {
 					// Simply instantiate the aspect
 					aif.getAspectInstance();

spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/SimpleMetadataAwareAspectInstanceFactory.java

@@ -46,7 +46,6 @@ public class SimpleMetadataAwareAspectInstanceFactory extends SimpleAspectInstan
 	}
 
 
-	@Override
 	public final AspectMetadata getAspectMetadata() {
 		return this.metadata;
 	}

spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/SingletonMetadataAwareAspectInstanceFactory.java

@@ -48,7 +48,6 @@ public class SingletonMetadataAwareAspectInstanceFactory extends SingletonAspect
 	}
 
 
-	@Override
 	public final AspectMetadata getAspectMetadata() {
 		return this.metadata;
 	}

spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java

@@ -126,13 +126,11 @@ public class AspectJAwareAdvisorAutoProxyCreator extends AbstractAdvisorAutoProx
 			this.comparator = comparator;
 		}
 
-		@Override
 		public int compareTo(Object obj) {
 			Advisor otherAdvisor = ((PartiallyComparableAdvisorHolder) obj).advisor;
 			return this.comparator.compare(this.advisor, otherAdvisor);
 		}
 
-		@Override
 		public int fallbackCompareTo(Object obj) {
 			return 0;
 		}

spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java

@@ -75,7 +75,6 @@ class AspectJPrecedenceComparator implements Comparator {
 	}
 
 
-	@Override
 	public int compare(Object o1, Object o2) {
 		if (!(o1 instanceof Advisor && o2 instanceof Advisor)) {
 			throw new IllegalArgumentException(

spring-aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java

@@ -58,7 +58,6 @@ import org.springframework.util.StringUtils;
  */
 public abstract class AbstractInterceptorDrivenBeanDefinitionDecorator implements BeanDefinitionDecorator {
 
-	@Override
 	public final BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definitionHolder, ParserContext parserContext) {
 		BeanDefinitionRegistry registry = parserContext.getRegistry();
 

spring-aop/src/main/java/org/springframework/aop/config/AdvisorComponentDefinition.java

@@ -91,7 +91,6 @@ public class AdvisorComponentDefinition extends AbstractComponentDefinition {
 	}
 
 
-	@Override
 	public String getName() {
 		return this.advisorBeanName;
 	}
@@ -111,7 +110,6 @@ public class AdvisorComponentDefinition extends AbstractComponentDefinition {
 		return this.beanReferences;
 	}
 
-	@Override
 	public Object getSource() {
 		return this.advisorDefinition.getSource();
 	}

spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceHandler.java

@@ -59,7 +59,6 @@ public class AopNamespaceHandler extends NamespaceHandlerSupport {
 	 * '{@code config}', '{@code spring-configured}', '{@code aspectj-autoproxy}'
 	 * and '{@code scoped-proxy}' tags.
 	 */
-	@Override
 	public void init() {
 		// In 2.0 XSD as well as in 2.1 XSD.
 		registerBeanDefinitionParser("config", new ConfigBeanDefinitionParser());

spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -79,6 +79,28 @@ public abstract class AopNamespaceUtils {
 		registerComponentIfNecessary(beanDefinition, parserContext);
 	}
 
+	/**
+	 * @deprecated since Spring 2.5, in favor of
+	 * {@link #registerAutoProxyCreatorIfNecessary(ParserContext, Element)} and
+	 * {@link AopConfigUtils#registerAutoProxyCreatorIfNecessary(BeanDefinitionRegistry, Object)}
+	 */
+	@Deprecated
+	public static void registerAutoProxyCreatorIfNecessary(ParserContext parserContext, Object source) {
+		BeanDefinition beanDefinition = AopConfigUtils.registerAutoProxyCreatorIfNecessary(
+				parserContext.getRegistry(), source);
+		registerComponentIfNecessary(beanDefinition, parserContext);
+	}
+
+	/**
+	 * @deprecated since Spring 2.5, in favor of
+	 * {@link AopConfigUtils#forceAutoProxyCreatorToUseClassProxying(BeanDefinitionRegistry)}
+	 */
+	@Deprecated
+	public static void forceAutoProxyCreatorToUseClassProxying(BeanDefinitionRegistry registry) {
+		AopConfigUtils.forceAutoProxyCreatorToUseClassProxying(registry);
+	}
+
+
 	private static void useClassProxyingIfNecessary(BeanDefinitionRegistry registry, Element sourceElement) {
 		if (sourceElement != null) {
 			boolean proxyTargetClass = Boolean.valueOf(sourceElement.getAttribute(PROXY_TARGET_CLASS_ATTRIBUTE));

spring-aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java

@@ -37,7 +37,6 @@ import org.springframework.beans.factory.xml.ParserContext;
  */
 class AspectJAutoProxyBeanDefinitionParser implements BeanDefinitionParser {
 
-	@Override
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		AopNamespaceUtils.registerAspectJAnnotationAutoProxyCreatorIfNecessary(parserContext, element);
 		extendBeanDefinition(element, parserContext);

spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java

@@ -95,7 +95,6 @@ class ConfigBeanDefinitionParser implements BeanDefinitionParser {
 	private ParseState parseState = new ParseState();
 
 
-	@Override
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		CompositeComponentDefinition compositeDef =
 				new CompositeComponentDefinition(element.getTagName(), parserContext.extractSource(element));

spring-aop/src/main/java/org/springframework/aop/config/MethodLocatingFactoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2009 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,7 +57,6 @@ public class MethodLocatingFactoryBean implements FactoryBean<Method>, BeanFacto
 		this.methodName = methodName;
 	}
 
-	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		if (!StringUtils.hasText(this.targetBeanName)) {
 			throw new IllegalArgumentException("Property 'targetBeanName' is required");
@@ -79,17 +78,14 @@ public class MethodLocatingFactoryBean implements FactoryBean<Method>, BeanFacto
 	}
 
 
-	@Override
 	public Method getObject() throws Exception {
 		return this.method;
 	}
 
-	@Override
 	public Class<Method> getObjectType() {
 		return Method.class;
 	}
 
-	@Override
 	public boolean isSingleton() {
 		return true;
 	}

spring-aop/src/main/java/org/springframework/aop/config/PointcutComponentDefinition.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2007 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,7 +46,6 @@ public class PointcutComponentDefinition extends AbstractComponentDefinition {
 	}
 
 
-	@Override
 	public String getName() {
 		return this.pointcutBeanName;
 	}
@@ -61,7 +60,6 @@ public class PointcutComponentDefinition extends AbstractComponentDefinition {
 		return new BeanDefinition[] {this.pointcutDefinition};
 	}
 
-	@Override
 	public Object getSource() {
 		return this.pointcutDefinition.getSource();
 	}

spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java

@@ -39,7 +39,6 @@ class ScopedProxyBeanDefinitionDecorator implements BeanDefinitionDecorator {
 	private static final String PROXY_TARGET_CLASS = "proxy-target-class";
 
 
-	@Override
 	public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition, ParserContext parserContext) {
 		boolean proxyTargetClass = true;
 		if (node instanceof Element) {

spring-aop/src/main/java/org/springframework/aop/config/SimpleBeanFactoryAwareAspectInstanceFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2007 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,6 @@ public class SimpleBeanFactoryAwareAspectInstanceFactory implements AspectInstan
 		this.aspectBeanName = aspectBeanName;
 	}
 
-	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 		if (!StringUtils.hasText(this.aspectBeanName)) {
@@ -60,12 +59,10 @@ public class SimpleBeanFactoryAwareAspectInstanceFactory implements AspectInstan
 	 * Look up the aspect bean from the {@link BeanFactory} and returns it.
 	 * @see #setAspectBeanName
 	 */
-	@Override
 	public Object getAspectInstance() {
 		return this.beanFactory.getBean(this.aspectBeanName);
 	}
 
-	@Override
 	public ClassLoader getAspectClassLoader() {
 		if (this.beanFactory instanceof ConfigurableBeanFactory) {
 			return ((ConfigurableBeanFactory) this.beanFactory).getBeanClassLoader();
@@ -75,7 +72,6 @@ public class SimpleBeanFactoryAwareAspectInstanceFactory implements AspectInstan
 		}
 	}
 
-	@Override
 	public int getOrder() {
 		if (this.beanFactory.isSingleton(this.aspectBeanName) &&
 				this.beanFactory.isTypeMatch(this.aspectBeanName, Ordered.class)) {

spring-aop/src/main/java/org/springframework/aop/config/SpringConfiguredBeanDefinitionParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,7 +50,6 @@ class SpringConfiguredBeanDefinitionParser implements BeanDefinitionParser {
 			"org.springframework.beans.factory.aspectj.AnnotationBeanConfigurerAspect";
 
 
-	@Override
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		if (!parserContext.getRegistry().containsBeanDefinition(BEAN_CONFIGURER_ASPECT_BEAN_NAME)) {
 			RootBeanDefinition def = new RootBeanDefinition();

spring-aop/src/main/java/org/springframework/aop/framework/AbstractAdvisingBeanPostProcessor.java

@@ -65,7 +65,6 @@ public abstract class AbstractAdvisingBeanPostProcessor extends ProxyConfig
 		this.beforeExistingAdvisors = beforeExistingAdvisors;
 	}
 
-	@Override
 	public void setBeanClassLoader(ClassLoader beanClassLoader) {
 		this.beanClassLoader = beanClassLoader;
 	}
@@ -74,18 +73,15 @@ public abstract class AbstractAdvisingBeanPostProcessor extends ProxyConfig
 		this.order = order;
 	}
 
-	@Override
 	public int getOrder() {
 		return this.order;
 	}
 
 
-	@Override
 	public Object postProcessBeforeInitialization(Object bean, String beanName) {
 		return bean;
 	}
 
-	@Override
 	public Object postProcessAfterInitialization(Object bean, String beanName) {
 		if (bean instanceof AopInfrastructureBean) {
 			// Ignore AOP infrastructure such as scoped proxies.

spring-aop/src/main/java/org/springframework/aop/framework/AbstractSingletonProxyFactoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -122,7 +122,6 @@ public abstract class AbstractSingletonProxyFactoryBean extends ProxyConfig
 		this.proxyClassLoader = classLoader;
 	}
 
-	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		if (this.proxyClassLoader == null) {
 			this.proxyClassLoader = classLoader;
@@ -130,7 +129,6 @@ public abstract class AbstractSingletonProxyFactoryBean extends ProxyConfig
 	}
 
 
-	@Override
 	public void afterPropertiesSet() {
 		if (this.target == null) {
 			throw new IllegalArgumentException("Property 'target' is required");
@@ -192,7 +190,6 @@ public abstract class AbstractSingletonProxyFactoryBean extends ProxyConfig
 	}
 
 
-	@Override
 	public Object getObject() {
 		if (this.proxy == null) {
 			throw new FactoryBeanNotInitializedException();
@@ -200,7 +197,6 @@ public abstract class AbstractSingletonProxyFactoryBean extends ProxyConfig
 		return this.proxy;
 	}
 
-	@Override
 	public Class<?> getObjectType() {
 		if (this.proxy != null) {
 			return this.proxy.getClass();
@@ -217,7 +213,6 @@ public abstract class AbstractSingletonProxyFactoryBean extends ProxyConfig
 		return null;
 	}
 
-	@Override
 	public final boolean isSingleton() {
 		return true;
 	}

spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java

@@ -137,12 +137,10 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 		setTargetSource(new SingletonTargetSource(target));
 	}
 
-	@Override
 	public void setTargetSource(TargetSource targetSource) {
 		this.targetSource = (targetSource != null ? targetSource : EMPTY_TARGET_SOURCE);
 	}
 
-	@Override
 	public TargetSource getTargetSource() {
 		return this.targetSource;
 	}
@@ -164,17 +162,14 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 		this.targetSource = EmptyTargetSource.forClass(targetClass);
 	}
 
-	@Override
 	public Class<?> getTargetClass() {
 		return this.targetSource.getTargetClass();
 	}
 
-	@Override
 	public void setPreFiltered(boolean preFiltered) {
 		this.preFiltered = preFiltered;
 	}
 
-	@Override
 	public boolean isPreFiltered() {
 		return this.preFiltered;
 	}
@@ -233,12 +228,10 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 		return this.interfaces.remove(intf);
 	}
 
-	@Override
 	public Class<?>[] getProxiedInterfaces() {
 		return this.interfaces.toArray(new Class[this.interfaces.size()]);
 	}
 
-	@Override
 	public boolean isInterfaceProxied(Class<?> intf) {
 		for (Class proxyIntf : this.interfaces) {
 			if (intf.isAssignableFrom(proxyIntf)) {
@@ -249,18 +242,15 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 	}
 
 
-	@Override
 	public final Advisor[] getAdvisors() {
 		return this.advisorArray;
 	}
 
-	@Override
 	public void addAdvisor(Advisor advisor) {
 		int pos = this.advisors.size();
 		addAdvisor(pos, advisor);
 	}
 
-	@Override
 	public void addAdvisor(int pos, Advisor advisor) throws AopConfigException {
 		if (advisor instanceof IntroductionAdvisor) {
 			validateIntroductionAdvisor((IntroductionAdvisor) advisor);
@@ -268,7 +258,6 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 		addAdvisorInternal(pos, advisor);
 	}
 
-	@Override
 	public boolean removeAdvisor(Advisor advisor) {
 		int index = indexOf(advisor);
 		if (index == -1) {
@@ -280,7 +269,6 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 		}
 	}
 
-	@Override
 	public void removeAdvisor(int index) throws AopConfigException {
 		if (isFrozen()) {
 			throw new AopConfigException("Cannot remove Advisor: Configuration is frozen.");
@@ -304,13 +292,11 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 		adviceChanged();
 	}
 
-	@Override
 	public int indexOf(Advisor advisor) {
 		Assert.notNull(advisor, "Advisor must not be null");
 		return this.advisors.indexOf(advisor);
 	}
 
-	@Override
 	public boolean replaceAdvisor(Advisor a, Advisor b) throws AopConfigException {
 		Assert.notNull(a, "Advisor a must not be null");
 		Assert.notNull(b, "Advisor b must not be null");
@@ -323,6 +309,16 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 		return true;
 	}
 
+	/**
+	 * Add all of the given advisors to this proxy configuration.
+	 * @param advisors the advisors to register
+	 * @deprecated as of Spring 3.0, in favor of {@link #addAdvisors}
+	 */
+	@Deprecated
+	public void addAllAdvisors(Advisor[] advisors) {
+		addAdvisors(Arrays.asList(advisors));
+	}
+
 	/**
 	 * Add all of the given advisors to this proxy configuration.
 	 * @param advisors the advisors to register
@@ -392,7 +388,6 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 	}
 
 
-	@Override
 	public void addAdvice(Advice advice) throws AopConfigException {
 		int pos = this.advisors.size();
 		addAdvice(pos, advice);
@@ -401,7 +396,6 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 	/**
 	 * Cannot add introductions this way unless the advice implements IntroductionInfo.
 	 */
-	@Override
 	public void addAdvice(int pos, Advice advice) throws AopConfigException {
 		Assert.notNull(advice, "Advice must not be null");
 		if (advice instanceof IntroductionInfo) {
@@ -418,7 +412,6 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 		}
 	}
 
-	@Override
 	public boolean removeAdvice(Advice advice) throws AopConfigException {
 		int index = indexOf(advice);
 		if (index == -1) {
@@ -430,7 +423,6 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 		}
 	}
 
-	@Override
 	public int indexOf(Advice advice) {
 		Assert.notNull(advice, "Advice must not be null");
 		for (int i = 0; i < this.advisors.size(); i++) {
@@ -562,7 +554,6 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 	}
 
 
-	@Override
 	public String toProxyConfigString() {
 		return toString();
 	}

spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java

@@ -146,12 +146,10 @@ final class CglibAopProxy implements AopProxy, Serializable {
 	}
 
 
-	@Override
 	public Object getProxy() {
 		return getProxy(null);
 	}
 
-	@Override
 	public Object getProxy(ClassLoader classLoader) {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Creating CGLIB proxy: target source is " + this.advised.getTargetSource());
@@ -388,7 +386,6 @@ final class CglibAopProxy implements AopProxy, Serializable {
 			this.target = target;
 		}
 
-		@Override
 		public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {
 			Object retVal = methodProxy.invoke(this.target, args);
 			return processReturnType(proxy, this.target, method, retVal);
@@ -408,7 +405,6 @@ final class CglibAopProxy implements AopProxy, Serializable {
 			this.target = target;
 		}
 
-		@Override
 		public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {
 			Object oldProxy = null;
 			try {
@@ -436,7 +432,6 @@ final class CglibAopProxy implements AopProxy, Serializable {
 			this.targetSource = targetSource;
 		}
 
-		@Override
 		public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {
 			Object target = this.targetSource.getTarget();
 			try {
@@ -461,7 +456,6 @@ final class CglibAopProxy implements AopProxy, Serializable {
 			this.targetSource = targetSource;
 		}
 
-		@Override
 		public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {
 			Object oldProxy = null;
 			Object target = this.targetSource.getTarget();
@@ -491,7 +485,6 @@ final class CglibAopProxy implements AopProxy, Serializable {
 			this.target = target;
 		}
 
-		@Override
 		public Object loadObject() {
 			return this.target;
 		}
@@ -509,7 +502,6 @@ final class CglibAopProxy implements AopProxy, Serializable {
 			this.advised = advised;
 		}
 
-		@Override
 		public Object loadObject() throws Exception {
 			return this.advised;
 		}
@@ -528,7 +520,6 @@ final class CglibAopProxy implements AopProxy, Serializable {
 			this.advised = advised;
 		}
 
-		@Override
 		public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) {
 			Object other = args[0];
 			if (proxy == other) {
@@ -561,7 +552,6 @@ final class CglibAopProxy implements AopProxy, Serializable {
 			this.advised = advised;
 		}
 
-		@Override
 		public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) {
 			return CglibAopProxy.class.hashCode() * 13 + this.advised.getTargetSource().hashCode();
 		}
@@ -585,7 +575,6 @@ final class CglibAopProxy implements AopProxy, Serializable {
 			this.targetClass = targetClass;
 		}
 
-		@Override
 		public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {
 			MethodInvocation invocation = new CglibMethodInvocation(proxy, this.target, method, args,
 					this.targetClass, this.adviceChain, methodProxy);
@@ -609,7 +598,6 @@ final class CglibAopProxy implements AopProxy, Serializable {
 			this.advised = advised;
 		}
 
-		@Override
 		public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {
 			Object oldProxy = null;
 			boolean setProxyContext = false;
@@ -766,7 +754,6 @@ final class CglibAopProxy implements AopProxy, Serializable {
 		 * DynamicUnadvisedInterceptor already considers this.</dd>
 		 * </dl>
 		 */
-		@Override
 		public int accept(Method method) {
 			if (AopUtils.isFinalizeMethod(method)) {
 				logger.debug("Found finalize() method - using NO_OVERRIDE");

spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java

@@ -46,7 +46,6 @@ import org.springframework.aop.support.MethodMatchers;
 @SuppressWarnings("serial")
 public class DefaultAdvisorChainFactory implements AdvisorChainFactory, Serializable {
 
-	@Override
 	public List<Object> getInterceptorsAndDynamicInterceptionAdvice(
 			Advised config, Method method, Class targetClass) {
 

spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ import org.springframework.aop.SpringProxy;
 @SuppressWarnings("serial")
 public class DefaultAopProxyFactory implements AopProxyFactory, Serializable {
 
-	@Override
+
 	public AopProxy createAopProxy(AdvisedSupport config) throws AopConfigException {
 		if (config.isOptimize() || config.isProxyTargetClass() || hasNoUserSuppliedProxyInterfaces(config)) {
 			Class targetClass = config.getTargetClass();

spring-aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java

@@ -106,12 +106,10 @@ final class JdkDynamicAopProxy implements AopProxy, InvocationHandler, Serializa
 	}
 
 
-	@Override
 	public Object getProxy() {
 		return getProxy(ClassUtils.getDefaultClassLoader());
 	}
 
-	@Override
 	public Object getProxy(ClassLoader classLoader) {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Creating JDK dynamic proxy: target source is " + this.advised.getTargetSource());
@@ -149,7 +147,6 @@ final class JdkDynamicAopProxy implements AopProxy, InvocationHandler, Serializa
 	 * <p>Callers will see exactly the exception thrown by the target,
 	 * unless a hook method throws an exception.
 	 */
-	@Override
 	public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 		MethodInvocation invocation;
 		Object oldProxy = null;

spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java

@@ -218,14 +218,12 @@ public class ProxyFactoryBean extends ProxyCreatorSupport
 		this.classLoaderConfigured = (classLoader != null);
 	}
 
-	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		if (!this.classLoaderConfigured) {
 			this.proxyClassLoader = classLoader;
 		}
 	}
 
-	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 		checkInterceptorNames();
@@ -239,7 +237,6 @@ public class ProxyFactoryBean extends ProxyCreatorSupport
 	 * {@code getObject()} for a proxy.
 	 * @return a fresh AOP proxy reflecting the current state of this factory
 	 */
-	@Override
 	public Object getObject() throws BeansException {
 		initializeAdvisorChain();
 		if (isSingleton()) {
@@ -260,7 +257,6 @@ public class ProxyFactoryBean extends ProxyCreatorSupport
 	 * a single one), the target bean type, or the TargetSource's target class.
 	 * @see org.springframework.aop.TargetSource#getTargetClass
 	 */
-	@Override
 	public Class<?> getObjectType() {
 		synchronized (this) {
 			if (this.singletonInstance != null) {
@@ -282,7 +278,6 @@ public class ProxyFactoryBean extends ProxyCreatorSupport
 		}
 	}
 
-	@Override
 	public boolean isSingleton() {
 		return this.singleton;
 	}
@@ -643,12 +638,10 @@ public class ProxyFactoryBean extends ProxyCreatorSupport
 			return beanName;
 		}
 
-		@Override
 		public Advice getAdvice() {
 			throw new UnsupportedOperationException("Cannot invoke methods: " + this.message);
 		}
 
-		@Override
 		public boolean isPerInstance() {
 			throw new UnsupportedOperationException("Cannot invoke methods: " + this.message);
 		}

spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java

@@ -114,17 +114,14 @@ public class ReflectiveMethodInvocation implements ProxyMethodInvocation, Clonea
 	}
 
 
-	@Override
 	public final Object getProxy() {
 		return this.proxy;
 	}
 
-	@Override
 	public final Object getThis() {
 		return this.target;
 	}
 
-	@Override
 	public final AccessibleObject getStaticPart() {
 		return this.method;
 	}
@@ -134,23 +131,19 @@ public class ReflectiveMethodInvocation implements ProxyMethodInvocation, Clonea
 	 * May or may not correspond with a method invoked on an underlying
 	 * implementation of that interface.
 	 */
-	@Override
 	public final Method getMethod() {
 		return this.method;
 	}
 
-	@Override
 	public final Object[] getArguments() {
 		return (this.arguments != null ? this.arguments : new Object[0]);
 	}
 
-	@Override
 	public void setArguments(Object[] arguments) {
 		this.arguments = arguments;
 	}
 
 
-	@Override
 	public Object proceed() throws Throwable {
 		//	We start with an index of -1 and increment early.
 		if (this.currentInterceptorIndex == this.interceptorsAndDynamicMethodMatchers.size() - 1) {
@@ -199,7 +192,6 @@ public class ReflectiveMethodInvocation implements ProxyMethodInvocation, Clonea
 	 * current interceptor index.
 	 * @see java.lang.Object#clone()
 	 */
-	@Override
 	public MethodInvocation invocableClone() {
 		Object[] cloneArguments = null;
 		if (this.arguments != null) {
@@ -218,7 +210,6 @@ public class ReflectiveMethodInvocation implements ProxyMethodInvocation, Clonea
 	 * current interceptor index.
 	 * @see java.lang.Object#clone()
 	 */
-	@Override
 	public MethodInvocation invocableClone(Object[] arguments) {
 		// Force initialization of the user attributes Map,
 		// for having a shared Map reference in the clone.
@@ -239,7 +230,6 @@ public class ReflectiveMethodInvocation implements ProxyMethodInvocation, Clonea
 	}
 
 
-	@Override
 	public void setUserAttribute(String key, Object value) {
 		if (value != null) {
 			if (this.userAttributes == null) {
@@ -254,7 +244,6 @@ public class ReflectiveMethodInvocation implements ProxyMethodInvocation, Clonea
 		}
 	}
 
-	@Override
 	public Object getUserAttribute(String key) {
 		return (this.userAttributes != null ? this.userAttributes.get(key) : null);
 	}

spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2007 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,12 +48,10 @@ public class AdvisorAdapterRegistrationManager implements BeanPostProcessor {
 	}
 
 
-	@Override
 	public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
 		return bean;
 	}
 
-	@Override
 	public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
 		if (bean instanceof AdvisorAdapter){
 			this.advisorAdapterRegistry.registerAdvisorAdapter((AdvisorAdapter) bean);

spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceAdapter.java

@@ -34,12 +34,10 @@ import org.springframework.aop.AfterReturningAdvice;
 @SuppressWarnings("serial")
 class AfterReturningAdviceAdapter implements AdvisorAdapter, Serializable {
 
-	@Override
 	public boolean supportsAdvice(Advice advice) {
 		return (advice instanceof AfterReturningAdvice);
 	}
 
-	@Override
 	public MethodInterceptor getInterceptor(Advisor advisor) {
 		AfterReturningAdvice advice = (AfterReturningAdvice) advisor.getAdvice();
 		return new AfterReturningAdviceInterceptor(advice);

spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceInterceptor.java

@@ -47,7 +47,6 @@ public class AfterReturningAdviceInterceptor implements MethodInterceptor, After
 		this.advice = advice;
 	}
 
-	@Override
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		Object retVal = mi.proceed();
 		this.advice.afterReturning(retVal, mi.getMethod(), mi.getArguments(), mi.getThis());

spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java

@@ -53,7 +53,6 @@ public class DefaultAdvisorAdapterRegistry implements AdvisorAdapterRegistry, Se
 	}
 
 
-	@Override
 	public Advisor wrap(Object adviceObject) throws UnknownAdviceTypeException {
 		if (adviceObject instanceof Advisor) {
 			return (Advisor) adviceObject;
@@ -75,7 +74,6 @@ public class DefaultAdvisorAdapterRegistry implements AdvisorAdapterRegistry, Se
 		throw new UnknownAdviceTypeException(advice);
 	}
 
-	@Override
 	public MethodInterceptor[] getInterceptors(Advisor advisor) throws UnknownAdviceTypeException {
 		List<MethodInterceptor> interceptors = new ArrayList<MethodInterceptor>(3);
 		Advice advice = advisor.getAdvice();
@@ -93,7 +91,6 @@ public class DefaultAdvisorAdapterRegistry implements AdvisorAdapterRegistry, Se
 		return interceptors.toArray(new MethodInterceptor[interceptors.size()]);
 	}
 
-	@Override
 	public void registerAdvisorAdapter(AdvisorAdapter adapter) {
 		this.adapters.add(adapter);
 	}

spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceAdapter.java

@@ -34,12 +34,10 @@ import org.springframework.aop.MethodBeforeAdvice;
 @SuppressWarnings("serial")
 class MethodBeforeAdviceAdapter implements AdvisorAdapter, Serializable {
 
-	@Override
 	public boolean supportsAdvice(Advice advice) {
 		return (advice instanceof MethodBeforeAdvice);
 	}
 
-	@Override
 	public MethodInterceptor getInterceptor(Advisor advisor) {
 		MethodBeforeAdvice advice = (MethodBeforeAdvice) advisor.getAdvice();
 		return new MethodBeforeAdviceInterceptor(advice);

spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceInterceptor.java

@@ -46,7 +46,6 @@ public class MethodBeforeAdviceInterceptor implements MethodInterceptor, Seriali
 		this.advice = advice;
 	}
 
-	@Override
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		this.advice.before(mi.getMethod(), mi.getArguments(), mi.getThis() );
 		return mi.proceed();

spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java

@@ -34,12 +34,10 @@ import org.springframework.aop.ThrowsAdvice;
 @SuppressWarnings("serial")
 class ThrowsAdviceAdapter implements AdvisorAdapter, Serializable {
 
-	@Override
 	public boolean supportsAdvice(Advice advice) {
 		return (advice instanceof ThrowsAdvice);
 	}
 
-	@Override
 	public MethodInterceptor getInterceptor(Advisor advisor) {
 		return new ThrowsAdviceInterceptor(advisor.getAdvice());
 	}

spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java

@@ -119,7 +119,6 @@ public class ThrowsAdviceInterceptor implements MethodInterceptor, AfterAdvice {
 		return handler;
 	}
 
-	@Override
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		try {
 			return mi.proceed();

spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,8 @@ import java.beans.PropertyDescriptor;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.aopalliance.aop.Advice;
@@ -138,11 +136,11 @@ public abstract class AbstractAutoProxyCreator extends ProxyConfig
 
 	private final Map<Object, Boolean> advisedBeans = new ConcurrentHashMap<Object, Boolean>(64);
 
-	private final Set<String> targetSourcedBeans =
-			Collections.newSetFromMap(new ConcurrentHashMap<String, Boolean>(16));
+	// using a ConcurrentHashMap as a Set
+	private final Map<String, Boolean> targetSourcedBeans = new ConcurrentHashMap<String, Boolean>(16);
 
-	private final Set<Object> earlyProxyReferences =
-			Collections.newSetFromMap(new ConcurrentHashMap<Object, Boolean>(16));
+	// using a ConcurrentHashMap as a Set
+	private final Map<Object, Boolean> earlyProxyReferences = new ConcurrentHashMap<Object, Boolean>(16);
 
 	private final Map<Object, Class<?>> proxyTypes = new ConcurrentHashMap<Object, Class<?>>(16);
 
@@ -157,7 +155,6 @@ public abstract class AbstractAutoProxyCreator extends ProxyConfig
 		this.order = order;
 	}
 
-	@Override
 	public final int getOrder() {
 		return this.order;
 	}
@@ -235,14 +232,12 @@ public abstract class AbstractAutoProxyCreator extends ProxyConfig
 		this.classLoaderConfigured = (classLoader != null);
 	}
 
-	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		if (!this.classLoaderConfigured) {
 			this.proxyClassLoader = classLoader;
 		}
 	}
 
-	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
@@ -256,29 +251,25 @@ public abstract class AbstractAutoProxyCreator extends ProxyConfig
 	}
 
 
-	@Override
 	public Class<?> predictBeanType(Class<?> beanClass, String beanName) {
 		Object cacheKey = getCacheKey(beanClass, beanName);
 		return this.proxyTypes.get(cacheKey);
 	}
 
-	@Override
 	public Constructor<?>[] determineCandidateConstructors(Class<?> beanClass, String beanName) throws BeansException {
 		return null;
 	}
 
-	@Override
 	public Object getEarlyBeanReference(Object bean, String beanName) throws BeansException {
 		Object cacheKey = getCacheKey(bean.getClass(), beanName);
-		this.earlyProxyReferences.add(cacheKey);
+		this.earlyProxyReferences.put(cacheKey, Boolean.TRUE);
 		return wrapIfNecessary(bean, beanName, cacheKey);
 	}
 
-	@Override
 	public Object postProcessBeforeInstantiation(Class<?> beanClass, String beanName) throws BeansException {
 		Object cacheKey = getCacheKey(beanClass, beanName);
 
-		if (beanName == null || !this.targetSourcedBeans.contains(beanName)) {
+		if (beanName == null || !this.targetSourcedBeans.containsKey(beanName)) {
 			if (this.advisedBeans.containsKey(cacheKey)) {
 				return null;
 			}
@@ -294,7 +285,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyConfig
 		if (beanName != null) {
 			TargetSource targetSource = getCustomTargetSource(beanClass, beanName);
 			if (targetSource != null) {
-				this.targetSourcedBeans.add(beanName);
+				this.targetSourcedBeans.put(beanName, Boolean.TRUE);
 				Object[] specificInterceptors = getAdvicesAndAdvisorsForBean(beanClass, beanName, targetSource);
 				Object proxy = createProxy(beanClass, beanName, specificInterceptors, targetSource);
 				this.proxyTypes.put(cacheKey, proxy.getClass());
@@ -305,19 +296,16 @@ public abstract class AbstractAutoProxyCreator extends ProxyConfig
 		return null;
 	}
 
-	@Override
 	public boolean postProcessAfterInstantiation(Object bean, String beanName) {
 		return true;
 	}
 
-	@Override
 	public PropertyValues postProcessPropertyValues(
 			PropertyValues pvs, PropertyDescriptor[] pds, Object bean, String beanName) {
 
 		return pvs;
 	}
 
-	@Override
 	public Object postProcessBeforeInitialization(Object bean, String beanName) {
 		return bean;
 	}
@@ -327,11 +315,10 @@ public abstract class AbstractAutoProxyCreator extends ProxyConfig
 	 * identified as one to proxy by the subclass.
 	 * @see #getAdvicesAndAdvisorsForBean
 	 */
-	@Override
 	public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
 		if (bean != null) {
 			Object cacheKey = getCacheKey(bean.getClass(), beanName);
-			if (!this.earlyProxyReferences.contains(cacheKey)) {
+			if (!this.earlyProxyReferences.containsKey(cacheKey)) {
 				return wrapIfNecessary(bean, beanName, cacheKey);
 			}
 		}
@@ -357,7 +344,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyConfig
 	 * @return a proxy wrapping the bean, or the raw bean instance as-is
 	 */
 	protected Object wrapIfNecessary(Object bean, String beanName, Object cacheKey) {
-		if (beanName != null && this.targetSourcedBeans.contains(beanName)) {
+		if (beanName != null && this.targetSourcedBeans.containsKey(beanName)) {
 			return bean;
 		}
 		if (Boolean.FALSE.equals(this.advisedBeans.get(cacheKey))) {

spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanFactoryAdvisorRetrievalHelper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -81,24 +81,32 @@ public class BeanFactoryAdvisorRetrievalHelper {
 
 		List<Advisor> advisors = new LinkedList<Advisor>();
 		for (String name : advisorNames) {
-			if (isEligibleBean(name) && !this.beanFactory.isCurrentlyInCreation(name)) {
-				try {
-					advisors.add(this.beanFactory.getBean(name, Advisor.class));
-				}
-				catch (BeanCreationException ex) {
-					Throwable rootCause = ex.getMostSpecificCause();
-					if (rootCause instanceof BeanCurrentlyInCreationException) {
-						BeanCreationException bce = (BeanCreationException) rootCause;
-						if (this.beanFactory.isCurrentlyInCreation(bce.getBeanName())) {
-							if (logger.isDebugEnabled()) {
-								logger.debug("Ignoring currently created advisor '" + name + "': " + ex.getMessage());
-							}
-							// Ignore: indicates a reference back to the bean we're trying to advise.
-							// We want to find advisors other than the currently created bean itself.
-							continue;
-						}
+			if (isEligibleBean(name)) {
+				if (this.beanFactory.isCurrentlyInCreation(name)) {
+					if (logger.isDebugEnabled()) {
+						logger.debug("Skipping currently created advisor '" + name + "'");
+					}
+				}
+				else {
+					try {
+						advisors.add(this.beanFactory.getBean(name, Advisor.class));
+					}
+					catch (BeanCreationException ex) {
+						Throwable rootCause = ex.getMostSpecificCause();
+						if (rootCause instanceof BeanCurrentlyInCreationException) {
+							BeanCreationException bce = (BeanCreationException) rootCause;
+							if (this.beanFactory.isCurrentlyInCreation(bce.getBeanName())) {
+								if (logger.isDebugEnabled()) {
+									logger.debug("Skipping advisor '" + name +
+											"' with dependency on currently created bean: " + ex.getMessage());
+								}
+								// Ignore: indicates a reference back to the bean we're trying to advise.
+								// We want to find advisors other than the currently created bean itself.
+								continue;
+							}
+						}
+						throw ex;
 					}
-					throw ex;
 				}
 			}
 		}

spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java

@@ -79,7 +79,6 @@ public class DefaultAdvisorAutoProxyCreator extends AbstractAdvisorAutoProxyCrea
 		return this.advisorBeanNamePrefix;
 	}
 
-	@Override
 	public void setBeanName(String name) {
 		// If no infrastructure bean name prefix has been set, override it.
 		if (this.advisorBeanNamePrefix == null) {

spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java

@@ -66,7 +66,6 @@ public abstract class AbstractBeanFactoryBasedTargetSourceCreator
 			new HashMap<String, DefaultListableBeanFactory>();
 
 
-	@Override
 	public final void setBeanFactory(BeanFactory beanFactory) {
 		if (!(beanFactory instanceof ConfigurableBeanFactory)) {
 			throw new IllegalStateException("Cannot do auto-TargetSource creation with a BeanFactory " +
@@ -87,7 +86,6 @@ public abstract class AbstractBeanFactoryBasedTargetSourceCreator
 	// Implementation of the TargetSourceCreator interface
 	//---------------------------------------------------------------------
 
-	@Override
 	public final TargetSource getTargetSource(Class<?> beanClass, String beanName) {
 		AbstractBeanFactoryBasedTargetSource targetSource =
 				createBeanFactoryBasedTargetSource(beanClass, beanName);
@@ -161,7 +159,6 @@ public abstract class AbstractBeanFactoryBasedTargetSourceCreator
 	 * Destroys the internal BeanFactory on shutdown of the TargetSourceCreator.
 	 * @see #getInternalBeanFactoryForBean
 	 */
-	@Override
 	public void destroy() {
 		synchronized (this.internalBeanFactories) {
 			for (DefaultListableBeanFactory bf : this.internalBeanFactories.values()) {

spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java

@@ -105,7 +105,6 @@ public abstract class AbstractTraceInterceptor implements MethodInterceptor, Ser
 	 * to the {@code invokeUnderTrace} method for handling.
 	 * @see #invokeUnderTrace(org.aopalliance.intercept.MethodInvocation, org.apache.commons.logging.Log)
 	 */
-	@Override
 	public Object invoke(MethodInvocation invocation) throws Throwable {
 		Log logger = getLoggerForInvocation(invocation);
 		if (isInterceptorEnabled(invocation, logger)) {

spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java

@@ -80,7 +80,6 @@ public abstract class AsyncExecutionAspectSupport implements BeanFactoryAware {
 	/**
 	 * Set the {@link BeanFactory} to be used when looking up executors by qualifier.
 	 */
-	@Override
 	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 		this.beanFactory = beanFactory;
 	}

spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionInterceptor.java

@@ -77,7 +77,6 @@ public class AsyncExecutionInterceptor extends AsyncExecutionAspectSupport
 	 * @return {@link Future} if the original method returns {@code Future}; {@code null}
 	 * otherwise.
 	 */
-	@Override
 	public Object invoke(final MethodInvocation invocation) throws Throwable {
 		Class<?> targetClass = (invocation.getThis() != null ? AopUtils.getTargetClass(invocation.getThis()) : null);
 		Method specificMethod = ClassUtils.getMostSpecificMethod(invocation.getMethod(), targetClass);
@@ -91,7 +90,6 @@ public class AsyncExecutionInterceptor extends AsyncExecutionAspectSupport
 
 		Future<?> result = executor.submit(
 				new Callable<Object>() {
-					@Override
 					public Object call() throws Exception {
 						try {
 							Object result = invocation.proceed();
@@ -127,7 +125,6 @@ public class AsyncExecutionInterceptor extends AsyncExecutionAspectSupport
 		return null;
 	}
 
-	@Override
 	public int getOrder() {
 		return Ordered.HIGHEST_PRECEDENCE;
 	}

spring-aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java

@@ -47,7 +47,6 @@ public class ConcurrencyThrottleInterceptor extends ConcurrencyThrottleSupport
 		setConcurrencyLimit(1);
 	}
 
-	@Override
 	public Object invoke(MethodInvocation methodInvocation) throws Throwable {
 		beforeAccess();
 		try {

spring-aop/src/main/java/org/springframework/aop/interceptor/CustomizableTraceInterceptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -325,19 +325,18 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
 		while (matcher.find()) {
 			String match = matcher.group();
 			if (PLACEHOLDER_METHOD_NAME.equals(match)) {
-				matcher.appendReplacement(output, Matcher.quoteReplacement(methodInvocation.getMethod().getName()));
+				matcher.appendReplacement(output, escape(methodInvocation.getMethod().getName()));
 			}
 			else if (PLACEHOLDER_TARGET_CLASS_NAME.equals(match)) {
 				String className = getClassForLogging(methodInvocation.getThis()).getName();
-				matcher.appendReplacement(output, Matcher.quoteReplacement(className));
+				matcher.appendReplacement(output, escape(className));
 			}
 			else if (PLACEHOLDER_TARGET_CLASS_SHORT_NAME.equals(match)) {
 				String shortName = ClassUtils.getShortName(getClassForLogging(methodInvocation.getThis()));
-				matcher.appendReplacement(output, Matcher.quoteReplacement(shortName));
+				matcher.appendReplacement(output, escape(shortName));
 			}
 			else if (PLACEHOLDER_ARGUMENTS.equals(match)) {
-				matcher.appendReplacement(output,
-						Matcher.quoteReplacement(StringUtils.arrayToCommaDelimitedString(methodInvocation.getArguments())));
+				matcher.appendReplacement(output, escape(StringUtils.arrayToCommaDelimitedString(methodInvocation.getArguments())));
 			}
 			else if (PLACEHOLDER_ARGUMENT_TYPES.equals(match)) {
 				appendArgumentTypes(methodInvocation, matcher, output);
@@ -346,7 +345,7 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
 				appendReturnValue(methodInvocation, matcher, output, returnValue);
 			}
 			else if (throwable != null && PLACEHOLDER_EXCEPTION.equals(match)) {
-				matcher.appendReplacement(output, Matcher.quoteReplacement(throwable.toString()));
+				matcher.appendReplacement(output, escape(throwable.toString()));
 			}
 			else if (PLACEHOLDER_INVOCATION_TIME.equals(match)) {
 				matcher.appendReplacement(output, Long.toString(invocationTime));
@@ -380,7 +379,7 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
 			matcher.appendReplacement(output, "null");
 		}
 		else {
-			matcher.appendReplacement(output, Matcher.quoteReplacement(returnValue.toString()));
+			matcher.appendReplacement(output, escape(returnValue.toString()));
 		}
 	}
 
@@ -400,8 +399,7 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
 		for (int i = 0; i < argumentTypeShortNames.length; i++) {
 			argumentTypeShortNames[i] = ClassUtils.getShortName(argumentTypes[i]);
 		}
-		matcher.appendReplacement(output,
-				Matcher.quoteReplacement(StringUtils.arrayToCommaDelimitedString(argumentTypeShortNames)));
+		matcher.appendReplacement(output, escape(StringUtils.arrayToCommaDelimitedString(argumentTypeShortNames)));
 	}
 
 	/**
@@ -419,4 +417,27 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
 		}
 	}
 
+	/**
+	 * Replaces {@code $} in inner class names with {@code \$}.
+	 * <p>This code is equivalent to JDK 1.5's {@code quoteReplacement}
+	 * method in the Matcher class itself. We're keeping our own version
+	 * here for JDK 1.4 compliance reasons only.
+	 */
+	private String escape(String input) {
+		StringBuilder sb = new StringBuilder();
+		for (int i = 0; i < input.length(); i++) {
+			char c = input.charAt(i);
+			if (c == '\\') {
+				sb.append("\\\\");
+			}
+			else if (c == '$') {
+				sb.append("\\$");
+			}
+			else {
+				sb.append(c);
+			}
+		}
+		return sb.toString();
+	}
+
 }

spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java

@@ -109,7 +109,6 @@ public abstract class ExposeBeanNameAdvisors {
 			this.beanName = beanName;
 		}
 
-		@Override
 		public Object invoke(MethodInvocation mi) throws Throwable {
 			if (!(mi instanceof ProxyMethodInvocation)) {
 				throw new IllegalStateException("MethodInvocation is not a Spring ProxyMethodInvocation: " + mi);
@@ -143,7 +142,6 @@ public abstract class ExposeBeanNameAdvisors {
 			return super.invoke(mi);
 		}
 
-		@Override
 		public String getBeanName() {
 			return this.beanName;
 		}

spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java

@@ -84,7 +84,6 @@ public class ExposeInvocationInterceptor implements MethodInterceptor, Ordered,
 	private ExposeInvocationInterceptor() {
 	}
 
-	@Override
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		MethodInvocation oldInvocation = invocation.get();
 		invocation.set(mi);
@@ -96,7 +95,6 @@ public class ExposeInvocationInterceptor implements MethodInterceptor, Ordered,
 		}
 	}
 
-	@Override
 	public int getOrder() {
 		return Ordered.HIGHEST_PRECEDENCE + 1;
 	}

spring-aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java

@@ -55,12 +55,10 @@ public class DefaultScopedObject implements ScopedObject, Serializable {
 	}
 
 
-	@Override
 	public Object getTargetObject() {
 		return this.beanFactory.getBean(this.targetBeanName);
 	}
 
-	@Override
 	public void removeFromScope() {
 		this.beanFactory.destroyScopedBean(this.targetBeanName);
 	}

spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java

@@ -78,7 +78,6 @@ public class ScopedProxyFactoryBean extends ProxyConfig implements FactoryBean<O
 		this.scopedTargetSource.setTargetBeanName(targetBeanName);
 	}
 
-	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		if (!(beanFactory instanceof ConfigurableBeanFactory)) {
 			throw new IllegalStateException("Not running in a ConfigurableBeanFactory: " + beanFactory);
@@ -112,7 +111,6 @@ public class ScopedProxyFactoryBean extends ProxyConfig implements FactoryBean<O
 	}
 
 
-	@Override
 	public Object getObject() {
 		if (this.proxy == null) {
 			throw new FactoryBeanNotInitializedException();
@@ -120,7 +118,6 @@ public class ScopedProxyFactoryBean extends ProxyConfig implements FactoryBean<O
 		return this.proxy;
 	}
 
-	@Override
 	public Class<?> getObjectType() {
 		if (this.proxy != null) {
 			return this.proxy.getClass();
@@ -131,7 +128,6 @@ public class ScopedProxyFactoryBean extends ProxyConfig implements FactoryBean<O
 		return null;
 	}
 
-	@Override
 	public boolean isSingleton() {
 		return true;
 	}

spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,7 +54,7 @@ public abstract class ScopedProxyUtils {
 		// Create a scoped proxy definition for the original bean name,
 		// "hiding" the target bean in an internal target definition.
 		RootBeanDefinition proxyDefinition = new RootBeanDefinition(ScopedProxyFactoryBean.class);
-		proxyDefinition.setOriginatingBeanDefinition(definition.getBeanDefinition());
+		proxyDefinition.setOriginatingBeanDefinition(targetDefinition);
 		proxyDefinition.setSource(definition.getSource());
 		proxyDefinition.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
 

spring-aop/src/main/java/org/springframework/aop/support/AbstractBeanFactoryPointcutAdvisor.java

@@ -69,7 +69,6 @@ public abstract class AbstractBeanFactoryPointcutAdvisor extends AbstractPointcu
 		return this.adviceBeanName;
 	}
 
-	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
@@ -80,7 +79,6 @@ public abstract class AbstractBeanFactoryPointcutAdvisor extends AbstractPointcu
 		}
 	}
 
-	@Override
 	public Advice getAdvice() {
 		synchronized (this.adviceMonitor) {
 			if (this.advice == null && this.adviceBeanName != null) {

spring-aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java

@@ -83,7 +83,6 @@ public abstract class AbstractExpressionPointcut implements ExpressionPointcut,
 	/**
 	 * Return this pointcut's expression.
 	 */
-	@Override
 	public String getExpression() {
 		return this.expression;
 	}

spring-aop/src/main/java/org/springframework/aop/support/AbstractGenericPointcutAdvisor.java

@@ -39,7 +39,6 @@ public abstract class AbstractGenericPointcutAdvisor extends AbstractPointcutAdv
 		this.advice = advice;
 	}
 
-	@Override
 	public Advice getAdvice() {
 		return this.advice;
 	}

spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java

@@ -44,7 +44,6 @@ public abstract class AbstractPointcutAdvisor implements PointcutAdvisor, Ordere
 		this.order = order;
 	}
 
-	@Override
 	public int getOrder() {
 		if (this.order != null) {
 			return this.order;
@@ -56,7 +55,6 @@ public abstract class AbstractPointcutAdvisor implements PointcutAdvisor, Ordere
 		return Ordered.LOWEST_PRECEDENCE;
 	}
 
-	@Override
 	public boolean isPerInstance() {
 		return true;
 	}

spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java

@@ -124,7 +124,6 @@ public abstract class AbstractRegexpMethodPointcut extends StaticMethodMatcherPo
 	 * of the target class as well as against the method's declaring class,
 	 * plus the name of the method.
 	 */
-	@Override
 	public boolean matches(Method method, Class targetClass) {
 		return ((targetClass != null && matchesPattern(targetClass.getName() + "." + method.getName())) ||
 				matchesPattern(method.getDeclaringClass().getName() + "." + method.getName()));

spring-aop/src/main/java/org/springframework/aop/support/ClassFilters.java

@@ -96,7 +96,6 @@ public abstract class ClassFilters {
 			this.filters = filters;
 		}
 
-		@Override
 		public boolean matches(Class clazz) {
 			for (int i = 0; i < this.filters.length; i++) {
 				if (this.filters[i].matches(clazz)) {
@@ -131,7 +130,6 @@ public abstract class ClassFilters {
 			this.filters = filters;
 		}
 
-		@Override
 		public boolean matches(Class clazz) {
 			for (int i = 0; i < this.filters.length; i++) {
 				if (!this.filters[i].matches(clazz)) {

spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java

@@ -170,12 +170,10 @@ public class ComposablePointcut implements Pointcut, Serializable {
 	}
 
 
-	@Override
 	public ClassFilter getClassFilter() {
 		return this.classFilter;
 	}
 
-	@Override
 	public MethodMatcher getMethodMatcher() {
 		return this.methodMatcher;
 	}

spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java

@@ -71,7 +71,6 @@ public class ControlFlowPointcut implements Pointcut, ClassFilter, MethodMatcher
 	/**
 	 * Subclasses can override this for greater filtering (and performance).
 	 */
-	@Override
 	public boolean matches(Class clazz) {
 		return true;
 	}
@@ -80,17 +79,14 @@ public class ControlFlowPointcut implements Pointcut, ClassFilter, MethodMatcher
 	 * Subclasses can override this if it's possible to filter out
 	 * some candidate classes.
 	 */
-	@Override
 	public boolean matches(Method method, Class targetClass) {
 		return true;
 	}
 
-	@Override
 	public boolean isRuntime() {
 		return true;
 	}
 
-	@Override
 	public boolean matches(Method method, Class targetClass, Object[] args) {
 		++this.evaluations;
 		ControlFlow cflow = ControlFlowFactory.createControlFlow();
@@ -105,12 +101,10 @@ public class ControlFlowPointcut implements Pointcut, ClassFilter, MethodMatcher
 	}
 
 
-	@Override
 	public ClassFilter getClassFilter() {
 		return this;
 	}
 
-	@Override
 	public MethodMatcher getMethodMatcher() {
 		return this;
 	}

spring-aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java

@@ -47,7 +47,6 @@ public class DefaultBeanFactoryPointcutAdvisor extends AbstractBeanFactoryPointc
 		this.pointcut = (pointcut != null ? pointcut : Pointcut.TRUE);
 	}
 
-	@Override
 	public Pointcut getPointcut() {
 		return this.pointcut;
 	}

spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java

@@ -102,12 +102,10 @@ public class DefaultIntroductionAdvisor implements IntroductionAdvisor, ClassFil
 		this.interfaces.add(intf);
 	}
 
-	@Override
 	public Class[] getInterfaces() {
 		return this.interfaces.toArray(new Class[this.interfaces.size()]);
 	}
 
-	@Override
 	public void validateInterfaces() throws IllegalArgumentException {
 		for (Class ifc : this.interfaces) {
 			if (this.advice instanceof DynamicIntroductionAdvice &&
@@ -123,28 +121,23 @@ public class DefaultIntroductionAdvisor implements IntroductionAdvisor, ClassFil
 		this.order = order;
 	}
 
-	@Override
 	public int getOrder() {
 		return this.order;
 	}
 
 
-	@Override
 	public Advice getAdvice() {
 		return this.advice;
 	}
 
-	@Override
 	public boolean isPerInstance() {
 		return true;
 	}
 
-	@Override
 	public ClassFilter getClassFilter() {
 		return this;
 	}
 
-	@Override
 	public boolean matches(Class clazz) {
 		return true;
 	}

spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java

@@ -77,7 +77,6 @@ public class DefaultPointcutAdvisor extends AbstractGenericPointcutAdvisor imple
 		this.pointcut = (pointcut != null ? pointcut : Pointcut.TRUE);
 	}
 
-	@Override
 	public Pointcut getPointcut() {
 		return this.pointcut;
 	}

spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java

@@ -83,7 +83,6 @@ public class DelegatePerTargetObjectIntroductionInterceptor extends Introduction
 	 * behaviour in around advice. However, subclasses should invoke this
 	 * method, which handles introduced interfaces and forwarding to the target.
 	 */
-	@Override
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		if (isMethodOnIntroducedInterface(mi)) {
 			Object delegate = getIntroductionDelegateFor(mi.getThis());

spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java

@@ -99,7 +99,6 @@ public class DelegatingIntroductionInterceptor extends IntroductionInfoSupport
 	 * behaviour in around advice. However, subclasses should invoke this
 	 * method, which handles introduced interfaces and forwarding to the target.
 	 */
-	@Override
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		if (isMethodOnIntroducedInterface(mi)) {
 			// Using the following method rather than direct reflection, we

spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcher.java

@@ -26,7 +26,6 @@ import org.springframework.aop.MethodMatcher;
  */
 public abstract class DynamicMethodMatcher implements MethodMatcher {
 
-	@Override
 	public final boolean isRuntime() {
 		return true;
 	}
@@ -35,7 +34,6 @@ public abstract class DynamicMethodMatcher implements MethodMatcher {
 	 * Can override to add preconditions for dynamic matching. This implementation
 	 * always returns true.
 	 */
-	@Override
 	public boolean matches(Method method, Class<?> targetClass) {
 		return true;
 	}

spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcherPointcut.java

@@ -30,12 +30,10 @@ import org.springframework.aop.Pointcut;
  */
 public abstract class DynamicMethodMatcherPointcut extends DynamicMethodMatcher implements Pointcut {
 
-	@Override
 	public ClassFilter getClassFilter() {
 		return ClassFilter.TRUE;
 	}
 
-	@Override
 	public final MethodMatcher getMethodMatcher() {
 		return this;
 	}

spring-aop/src/main/java/org/springframework/aop/support/IntroductionInfoSupport.java

@@ -59,7 +59,6 @@ public class IntroductionInfoSupport implements IntroductionInfo, Serializable {
 		this.publishedInterfaces.remove(intf);
 	}
 
-	@Override
 	public Class[] getInterfaces() {
 		return this.publishedInterfaces.toArray(new Class[this.publishedInterfaces.size()]);
 	}