Release version 4.0.0.M2

Enable Jibx binding with TestGroup.CUSTOM_COMPILATION
Previously the Jibx binding was commented out which caused failures when using the TestGroup.CUSTOM_COMPILATION Now the Jibx bindings are enabled when the CUSTOM_COMPILATION is enabled. Issue: SPR-10558
2026-06-08 17:33:33 +00:00 · 2013-07-24 08:56:11 -07:00 · 2013-07-24 10:17:09 -05:00 · 2013-07-24 09:29:17 -05:00 · 2013-07-24 10:24:13 -04:00 · 2013-07-24 15:30:18 +02:00
2391 changed files with 70088 additions and 64016 deletions
@@ -1,14 +0,0 @@
-Juergen Hoeller <jhoeller@vmware.com> jhoeller <jhoeller@vmware.com>
-<rstoyanchev@gopivotal.com> <rstoyanchev@vmware.com>
-<pwebb@gopivotal.com> <pwebb@vmware.com>
-<cbeams@gopivotal.com> <cbeams@vmware.com>
-<cbeams@gopivotal.com> <cbeams@gmail.com>
-<apoutsma@gopivotal.com> <apoutsma@vmware.com>
-<apoutsma@gopivotal.com> <poutsma@mac.com>
-<ogierke@gopivotal.com> <ogierke@vmware.com>
-<dsyer@gopivotal.com> <david_syer@hotmail.com>
-<dsyer@gopivotal.com> <dsyer@vmware.com>
-<aclement@gopivotal.com> <andrew.clement@gmail.com>
-<aclement@gopivotal.com> <aclement@vmware.com>
-<dmitry.katsubo@gmail.com> <dmitry.katsubo@gmai.com>
-Nick Williams <nicholas@nicholaswilliams.net> Nicholas Williams <nicholas@nicholaswilliams.net> 
@@ -47,13 +47,11 @@ future pull requests as well, simply so that the Spring Framework team knows
 immediately that this process is complete.


-## Create your branch from `3.2.x`
+## Create your branch from `master`

-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`.
+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.


 ## Use short branch names
@@ -129,7 +127,7 @@ e.g.
 * ...
 *
 * @author First Last
- * @since 3.2
+ * @since 4.0
 * @see ...
 */
 ```
@@ -10,8 +10,6 @@ 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
@@ -35,20 +33,31 @@ 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. The only
-prerequisites are [Git][] and JDK 1.7+.
+a cross-platform, self-contained bootstrap mechanism for the build.
+
+### prerequisites
+
+[Git][] and [Early Access build of OpenJDK 1.8 build 88][JDK18 build 88]
+> **Note:** Do not use the "lambda" edition of JDK b88 when building the
+framework, as it still causes some errors. It should be fine, however, to
+*run* against various versions of OpenJDK 1.8, lambda or otherwise.
+
+Be sure that your `JAVA_HOME` environment variable points to the `jdk1.8.0` folder
+extracted from the JDK download.

 ### check out sources
 `git clone git://github.com/SpringSource/spring-framework.git`

-### 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.
+> **Note:** Per the prerequisites above, ensure that you have JDK 8 configured
+properly in your IDE.

 ### install all spring-\* jars into your local Maven cache
 `./gradlew install`

-### import sources into your IDE
-Run `./import-into-eclipse.sh` or read `import-into-idea.md` as appropriate.
+### compile and test, build all jars, distribution zips and docs
+`./gradlew build`

 ... and discover more commands with `./gradlew tasks`. See also the [Gradle
 build and release FAQ][].
@@ -68,8 +77,6 @@ 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
@@ -86,6 +93,7 @@ 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
+[JDK18 build 88]: https://jdk8.java.net/archive/8-b88.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
@@ -3,8 +3,8 @@ buildscript {
 		maven { url "http://repo.springsource.org/plugins-release" }
 	}
 	dependencies {
-		classpath("org.springframework.build.gradle:propdeps-plugin:0.0.6")
-		classpath("org.springframework.build.gradle:docbook-reference-plugin:0.2.8")
+		classpath("org.springframework.build.gradle:propdeps-plugin:0.0.4")
+		classpath("org.springframework.build.gradle:docbook-reference-plugin:0.2.7")
 	}
 }

@@ -12,10 +12,15 @@ configure(allprojects) { project ->
 	group = "org.springframework"
 	version = qualifyVersionIfNecessary(version)

-	ext.aspectjVersion  = "1.7.4"
+	// The following is a work-around 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.6"
+	ext.slf4jVersion    = "1.6.1"
 	ext.gradleScriptDir = "${rootProject.projectDir}/gradle"

 	apply plugin: "propdeps"
@@ -24,12 +29,12 @@ configure(allprojects) { project ->
 	apply from: "${gradleScriptDir}/ide.gradle"

 	compileJava {
-		sourceCompatibility=1.5
-		targetCompatibility=1.5
+		sourceCompatibility=1.6
+		targetCompatibility=1.6
 	}
 	compileTestJava {
-		sourceCompatibility=1.7
-		targetCompatibility=1.7
+		sourceCompatibility=1.8
+		targetCompatibility=1.8
 	}

 	[compileJava, compileTestJava]*.options*.compilerArgs = [
@@ -59,16 +64,12 @@ configure(allprojects) { project ->
 		systemProperty("java.awt.headless", "true")
 		systemProperty("testGroups", project.properties.get("testGroups"))
 		scanForTestClasses = false
-		// Do not include "**/*Test.class" since some *Test classes are broken.
-		include(["**/*Tests.class"])
-		// Since we set scanForTestClasses to false, we need to filter out inner
-		// classes with the "$" pattern; otherwise, using -Dtest.single=MyTests to
-		// run MyTests by itself will fail if MyTests contains any inner classes. 
-		exclude(["**/Abstract*.class", '**/*$*'])
+		include '**/*Tests.*'
+		exclude '**/*Abstract*.*'
 	}

 	repositories {
-		maven { url "http://repo.spring.io/libs-release" }
+		maven { url "http://repo.springsource.org/libs-release" }
 	}

 	dependencies {
@@ -89,17 +90,13 @@ configure(allprojects) { project ->
 		"http://commons.apache.org/proper/commons-codec/apidocs/",
 		"http://commons.apache.org/proper/commons-dbcp/apidocs/",
 		"http://portals.apache.org/pluto/portlet-2.0-apidocs/",
-		"http://tiles.apache.org/tiles-request/apidocs/",
 		"http://tiles.apache.org/framework/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.2.0/",
-		"http://jackson.codehaus.org/1.9.4/javadoc/",
-		"http://fasterxml.github.com/jackson-core/javadoc/2.3.0/",
-		"http://fasterxml.github.com/jackson-databind/javadoc/2.3.0/",
-		"http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs",
-		"http://ibatis.apache.org/docs/java/dev/"
+		"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/",
 	] as String[]
 }

@@ -128,9 +125,7 @@ configure(subprojects - project(":spring-build-src")) { subproject ->
 		options.author = true
 		options.header = project.name
 		options.links(project.ext.javadocLinks)
-		if (JavaVersion.current().isJava8Compatible()) {
-			options.addStringOption('Xdoclint:none', '-quiet')
-		}
+		options.addStringOption('Xdoclint:none', '-quiet')

 		// suppress warnings due to cross-module @see and @link references;
 		// note that global 'api' task does display all warnings.
@@ -170,39 +165,17 @@ project("spring-build-src") {
 project("spring-core") {
 	description = "Spring Core"

-	// As of Spring 3.2.9, spring-core repackages asm 5.0 and cglib 3.1, inlining both
-	// into the spring-core jar. cglib 3.1 itself depends on asm 4+, and is therefore
+	// 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
 	// further transformed by the JarJar task to depend on org.springframework.asm; this
-	// 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 = "5.0.2"
-	def cglibVersion = "3.1"
+	// avoids including two different copies of asm unnecessarily.
+	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
@@ -227,16 +200,13 @@ 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.3")
+		compile("commons-logging:commons-logging:1.1.1")
 		optional("org.aspectj:aspectjweaver:${aspectjVersion}")
-		optional("net.sf.jopt-simple:jopt-simple:3.3")
+		optional("net.sf.jopt-simple:jopt-simple:4.4")
 		optional("log4j:log4j:1.2.17")
 		testCompile("xmlunit:xmlunit:1.3")
 		testCompile("org.codehaus.woodstox:wstx-asl:3.2.7") {
@@ -245,11 +215,7 @@ project("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/**"
-		}
+		// inline repackaged cglib classes directly into the spring-core jar
 		dependsOn cglibRepackJar
 		from(zipTree(cglibRepackJar.archivePath)) {
 			include "org/springframework/cglib/**"
@@ -263,8 +229,8 @@ project("spring-beans") {
 	dependencies {
 		compile(project(":spring-core"))
 		compile(files(project(":spring-core").cglibRepackJar))
-		optional("javax.el:el-api:1.0")
-		optional("javax.inject:javax.inject:1")
+		provided("javax.el:javax.el-api:2.2.4")
+		provided("javax.inject:javax.inject:1")
 		testCompile("log4j:log4j:1.2.17")
 	}
 }
@@ -273,13 +239,13 @@ project("spring-aop") {
 	description = "Spring AOP"

 	dependencies {
-		compile(project(":spring-beans"))
 		compile(project(":spring-core"))
 		compile(files(project(":spring-core").cglibRepackJar))
+		compile(project(":spring-beans"))
 		compile("aopalliance:aopalliance:1.0")
-		optional("org.aspectj:aspectjweaver:${aspectjVersion}")
-		optional("commons-pool:commons-pool:1.5.7")
 		optional("com.jamonapi:jamon:2.4")
+		optional("commons-pool:commons-pool:1.5.3")
+		optional("org.aspectj:aspectjweaver:${aspectjVersion}")
 	}
 }

@@ -315,27 +281,28 @@ project("spring-context") {
 	description = "Spring Context"

 	dependencies {
+		optional(project(":spring-instrument"))
 		compile(project(":spring-aop"))
 		compile(project(":spring-beans"))
 		compile(project(":spring-expression"))
 		compile(project(":spring-core"))
 		compile(files(project(":spring-core").cglibRepackJar))
-		optional(project(":spring-instrument"))
-		optional("javax.inject:javax.inject:1")
 		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("backport-util-concurrent:backport-util-concurrent:3.0")
-		optional("javax.persistence:persistence-api:1.0")
-		optional("javax.validation:validation-api:1.0.0.GA")
-		optional("org.hibernate:hibernate-validator:4.3.1.Final")
-		optional("joda-time:joda-time:2.2")
-		optional("org.aspectj:aspectjweaver:${aspectjVersion}")
-		optional("org.codehaus.groovy:groovy-all:1.8.9")
+		optional("org.eclipse.persistence:javax.persistence:2.0.0")
 		optional("org.beanshell:bsh:2.0b4")
-		optional("org.jruby:jruby:1.7.12")
+		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.slf4j:slf4j-api:${slf4jVersion}")
+		optional("javax.validation:validation-api:1.0.0.GA")
+		optional("org.hibernate:hibernate-validator:4.3.0.Final")
+		optional("org.aspectj:aspectjweaver:${aspectjVersion}")
+		optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1")
+		testCompile("commons-dbcp:commons-dbcp:1.2.2")
 		testCompile("javax.inject:javax.inject-tck:1")
-		testCompile("commons-dbcp:commons-dbcp:1.3")
-		testCompile("org.slf4j:slf4j-api:${slf4jVersion}")
 	}

 	// pick up RmiInvocationWrapperRTD.xml in src/main
@@ -346,21 +313,42 @@ project("spring-context") {
 	}
 }

-project("spring-tx") {
-	description = "Spring Transaction"
+project("spring-messaging") {
+	description = "Spring Messaging"

 	dependencies {
 		compile(project(":spring-beans"))
 		compile(project(":spring-core"))
-		optional(project(":spring-aop"))
+		compile(project(":spring-context"))
+		optional(project(":spring-websocket"))
+		optional("com.fasterxml.jackson.core:jackson-databind:2.2.0")
+		optional("org.projectreactor:reactor-core:1.0.0.M1")
+		optional("org.projectreactor:reactor-tcp:1.0.0.M1")
+		optional("com.lmax:disruptor:3.1.1")
+		testCompile("commons-dbcp:commons-dbcp:1.2.2")
+		testCompile("javax.inject:javax.inject-tck:1")
+	}
+
+	repositories {
+		maven { url 'http://repo.springsource.org/libs-milestone' } // reactor
+	}
+}
+
+project("spring-tx") {
+	description = "Spring Transaction"
+
+	dependencies {
 		optional(project(":spring-context")) // for JCA, @EnableTransactionManagement
-		optional("aopalliance:aopalliance:1.0")
-		optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1")
+		optional(project(":spring-aop"))
+		compile(project(":spring-beans"))
+		compile(project(":spring-core"))
+		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("javax.ejb:ejb-api:3.0")
-		optional("com.ibm.websphere:uow:6.0.2.17")
+		testCompile("org.eclipse.persistence:javax.persistence:2.0.0")
 		testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
-		testCompile("javax.persistence:persistence-api:1.0")
 	}
 }

@@ -378,24 +366,14 @@ project("spring-oxm") {
 	dependencies {
 		compile(project(":spring-beans"))
 		compile(project(":spring-core"))
-		optional("org.codehaus.castor:castor-xml:1.3.3")  {
-			exclude group: 'stax', module: 'stax-api'
-			exclude group: "org.springframework", module: "spring-context"
-		}
-		optional("org.apache.xmlbeans:xmlbeans:2.6.0") {
-			exclude group: 'stax', module: 'stax-api'
-		}
-		optional("com.thoughtworks.xstream:xstream:1.4.7") {
-			exclude group: 'xpp3', module: 'xpp3_min'
-			exclude group: 'xmlpull', module: 'xmlpull'
-		}
-		optional("org.jibx:jibx-run:1.2.5")
 		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("org.codehaus.castor:castor-xml:1.3.2")
+		testCompile("org.codehaus.jettison:jettison:1.0.1")
 		testCompile("xmlunit:xmlunit:1.3")
 		testCompile("xmlpull:xmlpull:1.1.3.4a")
-		testCompile("org.codehaus.jettison:jettison:1.0.1") {
-			exclude group: 'stax', module: 'stax-api'
-		}
 		testCompile(files(genCastor.classesDir).builtBy(genCastor))
 		testCompile(files(genJaxb.classesDir).builtBy(genJaxb))
 		testCompile(files(genXmlbeans.classesDir).builtBy(genXmlbeans))
@@ -411,13 +389,13 @@ project("spring-jms") {
 		compile(project(":spring-aop"))
 		compile(project(":spring-context"))
 		compile(project(":spring-tx"))
-		provided("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1")
 		optional(project(":spring-oxm"))
-		optional("aopalliance:aopalliance:1.0")
+		compile("aopalliance:aopalliance:1.0")
+		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.7.9")
-		optional("com.fasterxml.jackson.core:jackson-databind:2.0.6")
+		optional("org.codehaus.jackson:jackson-mapper-asl:1.9.12")
+		optional("com.fasterxml.jackson.core:jackson-databind:2.2.0")
 	}
 }

@@ -425,16 +403,16 @@ project("spring-jdbc") {
 	description = "Spring JDBC"

 	dependencies {
-		compile(project(":spring-beans"))
 		compile(project(":spring-core"))
-		compile(project(":spring-tx"))
+		compile(project(":spring-beans"))
 		optional(project(":spring-context")) // for JndiDataSourceLookup
-		optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1")
+		compile(project(":spring-tx"))
 		optional("c3p0:c3p0:0.9.1.2")
 		optional("hsqldb:hsqldb:${hsqldbVersion}")
-		optional("com.h2database:h2:1.0.79")
+		optional("com.h2database:h2:1.0.71")
 		optional("org.apache.derby:derby:10.5.3.0_1")
 		optional("org.apache.derby:derbyclient:10.5.3.0_1")
+		optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1")
 	}
 }

@@ -445,23 +423,25 @@ project("spring-context-support") {
 		compile(project(":spring-core"))
 		compile(project(":spring-beans"))
 		compile(project(":spring-context"))
-		provided("javax.activation:activation:1.1")
 		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.5")
-		optional("net.sf.ehcache:ehcache-core:2.0.1")
-		optional("org.quartz-scheduler:quartz:1.7.3")
+		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("org.codehaus.fabric3.api:commonj:1.1.0")
-		optional("velocity:velocity:1.5")
-		optional("org.freemarker:freemarker:2.3.20")
+		optional("org.apache.velocity:velocity:1.7")
+		optional("org.freemarker:freemarker:2.3.19")
 		optional("com.lowagie:itext:2.1.7")
-		optional("net.sf.jasperreports:jasperreports:3.7.6")
-		testCompile("org.apache.poi:poi:3.6")
+		optional("net.sf.jasperreports:jasperreports:5.1.0")
+		optional("org.slf4j:slf4j-api:${slf4jVersion}")
+		provided("javax.activation:activation:1.1")
+		testCompile("org.apache.poi:poi:3.9")
 		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}")
-		testCompile("org.slf4j:slf4j-api:${slf4jVersion}")
 	}

 	// pick up **/*.types files in src/main
@@ -472,28 +452,24 @@ project("spring-web") {
 	description = "Spring Web"

 	dependencies {
-		compile(project(":spring-aop")) // for JaxWsPortProxyFactoryBean
-		compile(project(":spring-beans")) // for MultiPartFilter
-		compile(project(":spring-context"))
 		compile(project(":spring-core"))
-		provided("javax.servlet:javax.servlet-api:3.0.1")
-		provided("javax.activation:activation:1.1")
+		compile(project(":spring-beans")) // for MultiPartFilter
+		compile(project(":spring-aop")) // for JaxWsPortProxyFactoryBean
+		compile(project(":spring-context"))
 		optional(project(":spring-oxm")) // for MarshallingHttpMessageConverter
-		optional("javax.servlet.jsp:jsp-api:2.1")
-		optional("javax.portlet:portlet-api:2.0")
-		optional("javax.el:el-api:1.0")
-		optional("javax.faces:jsf-api:1.2_08")
-		optional("javax.xml:jaxrpc-api:1.1")
-		optional("javax.xml.soap:saaj-api:1.3")
-		optional("aopalliance:aopalliance:1.0")
-		optional("com.caucho:hessian:3.2.1")
-		optional("commons-fileupload:commons-fileupload:1.3.1")
-		optional("commons-io:commons-io:1.3")
-		optional("commons-httpclient:commons-httpclient:3.1")
-		optional("org.apache.httpcomponents:httpclient:4.2.6")
-		optional("org.codehaus.jackson:jackson-mapper-asl:1.7.9")
-		optional("com.fasterxml.jackson.core:jackson-databind:2.0.6")
+		compile("aopalliance:aopalliance:1.0")
+		provided("javax.el:javax.el-api:2.2.4")
+		provided("com.sun.faces:jsf-api:2.1.7")
+		provided("javax.portlet:portlet-api:2.0")
+		provided("javax.servlet:javax.servlet-api:3.0.1")
+		provided("javax.servlet.jsp:jsp-api:2.1")
+		provided("javax.activation:activation:1.1")
+		optional("com.caucho:hessian:4.0.7")
 		optional("rome:rome:1.0")
+		optional("commons-fileupload:commons-fileupload:1.3")
+		optional("org.apache.httpcomponents:httpclient:4.2")
+		optional("org.codehaus.jackson:jackson-mapper-asl:1.9.12")
+		optional("com.fasterxml.jackson.core:jackson-databind:2.2.0")
 		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"
@@ -510,41 +486,58 @@ 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("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.0")
+		optional("org.glassfish.tyrus:tyrus-container-servlet:1.0")
+		optional("org.eclipse.jetty:jetty-webapp:9.0.4.v20130625") {
+			exclude group: "org.eclipse.jetty.orbit", module: "javax.servlet"
+		}
+		optional("org.eclipse.jetty.websocket:websocket-server:9.0.4.v20130625")
+		optional("org.eclipse.jetty.websocket:websocket-client:9.0.4.v20130625")
+		optional("com.fasterxml.jackson.core:jackson-databind:2.2.0") // required for SockJS support currently
+	}
+
+	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
-		sourceCompatibility=1.6
-		targetCompatibility=1.6
-	}
-
 	dependencies {
-		compile(project(":spring-beans"))
+		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.jdo:jdo-api:3.0")
+		provided("javax.servlet:javax.servlet-api:3.0.1")
+		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
+		testCompile("commons-dbcp:commons-dbcp:1.2.2")
+		testCompile("hsqldb:hsqldb:${hsqldbVersion}")
 		compile(project(":spring-core"))
-		compile(project(":spring-jdbc"))
-		compile(project(":spring-tx"))
+		compile(project(":spring-beans"))
 		optional(project(":spring-aop"))
 		optional(project(":spring-context"))
+		compile(project(":spring-tx"))
+		compile(project(":spring-jdbc"))
 		optional(project(":spring-web"))
-		optional("aopalliance:aopalliance:1.0")
-		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")
-		optional("org.apache.ibatis:ibatis-sqlmap:2.3.4.726")
-		optional("javax.servlet:servlet-api:2.5")
-		testCompile("javax.servlet:javax.servlet-api:3.0.1")
-		testCompile("org.eclipse.persistence:org.eclipse.persistence.asm:1.0.1")
-		testCompile("org.eclipse.persistence:org.eclipse.persistence.antlr:1.0.1")
-		testCompile("commons-dbcp:commons-dbcp:1.3")
-		testCompile("hsqldb:hsqldb:${hsqldbVersion}")
-		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
 	}
 }

@@ -553,12 +546,12 @@ project("spring-orm-hibernate4") {
 	merge.into = project(":spring-orm")

 	dependencies {
-		provided(project(":spring-jdbc"))
 		provided(project(":spring-tx"))
+		provided(project(":spring-jdbc"))
+		optional("org.hibernate:hibernate-core:4.2.1.Final")
+		optional("org.hibernate:hibernate-entitymanager:4.2.1.Final")
 		optional(project(":spring-web"))
-		optional("org.hibernate:hibernate-core:4.2.12.Final")
-		optional("org.hibernate:hibernate-entitymanager:4.2.12.Final")
-		optional("javax.servlet:servlet-api:2.5")
+		optional("javax.servlet:javax.servlet-api:3.0.1")
 	}
 }

@@ -566,33 +559,34 @@ project("spring-webmvc") {
 	description = "Spring Web MVC"

 	dependencies {
-		compile(project(":spring-beans"))
-		compile(project(":spring-context"))
 		compile(project(":spring-core"))
 		compile(project(":spring-expression"))
+		compile(project(":spring-beans"))
 		compile(project(":spring-web"))
-		provided("javax.servlet:javax.servlet-api:3.0.1")
+		compile(project(":spring-context"))
 		optional(project(":spring-context-support")) // for Velocity support
 		optional(project(":spring-oxm")) // for MarshallingView
-		optional("javax.servlet.jsp:jsp-api:2.1")
-		optional("javax.servlet:jstl:1.2")
-		optional("net.sourceforge.jexcelapi:jxl:2.6.12")
-		optional("org.apache.poi:poi:3.6")
-		optional("velocity:velocity:1.5")
-		optional("velocity-tools:velocity-tools-view:1.4")
-		optional("org.freemarker:freemarker:2.3.20")
-		optional("com.lowagie:itext:2.1.7")
-		optional("net.sf.jasperreports:jasperreports:3.7.6") {
-			exclude group: "xml-apis", module: "xml-apis"
-		}
-		optional("org.codehaus.jackson:jackson-mapper-asl:1.7.9")
-		optional("com.fasterxml.jackson.core:jackson-databind:2.0.6")
-		optional("rome:rome:1.0")
 		optional("org.apache.tiles:tiles-api:2.1.2")
 		optional("org.apache.tiles:tiles-core:2.1.2")
 		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("com.lowagie:itext:2.1.7")
+		optional("net.sf.jasperreports:jasperreports:5.1.0") {
+			exclude group: "xml-apis", module: "xml-apis"
+		}
+		optional("rome:rome:1.0")
+		optional("org.apache.velocity:velocity:1.7")
+		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")
+		provided("javax.servlet:jstl:1.2")
+		provided("javax.servlet:javax.servlet-api:3.0.1")
+		provided("javax.servlet.jsp:jsp-api:2.1")
 		testCompile(project(":spring-aop"))
+		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
 		testCompile("rhino:js:1.7R1")
 		testCompile("xmlunit:xmlunit:1.3")
 		testCompile("dom4j:dom4j:1.6.1") {
@@ -610,11 +604,10 @@ project("spring-webmvc") {
 			exclude group: "org.eclipse.jetty.orbit", module: "javax.servlet"
 		}
 		testCompile("javax.validation:validation-api:1.0.0.GA")
-		testCompile("org.hibernate:hibernate-validator:4.3.1.Final")
-		testCompile("org.apache.httpcomponents:httpclient:4.2.6")
-		testCompile("commons-fileupload:commons-fileupload:1.3.1")
+		testCompile("commons-fileupload:commons-fileupload:1.2")
 		testCompile("commons-io:commons-io:1.3")
-		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
+		testCompile("org.hibernate:hibernate-validator:4.3.0.Final")
+		testCompile("org.apache.httpcomponents:httpclient:4.2")
 	}

 	// pick up DispatcherServlet.properties in src/main
@@ -628,27 +621,27 @@ project("spring-webmvc-tiles3") {
 	dependencies {
 		provided(project(":spring-context"))
 		provided(project(":spring-web"))
+		provided("javax.el:javax.el-api:2.2.4")
+		provided("javax.servlet:jstl:1.2")
+		provided("javax.servlet.jsp:jsp-api:2.1")
+		optional("org.apache.tiles:tiles-request-api:1.0.1")
+		optional("org.apache.tiles:tiles-api:3.0.1")
+		optional("org.apache.tiles:tiles-core:3.0.1") {
+			exclude group: "org.slf4j", module: "jcl-over-slf4j"
+		}
+		optional("org.apache.tiles:tiles-servlet:3.0.1") {
+			exclude group: "org.slf4j", module: "jcl-over-slf4j"
+		}
+		optional("org.apache.tiles:tiles-jsp:3.0.1") {
+			exclude group: "org.slf4j", module: "jcl-over-slf4j"
+		}
+		optional("org.apache.tiles:tiles-extras:3.0.1") {
+			exclude group: "org.slf4j", module: "jcl-over-slf4j"
+		}
+		optional("org.apache.tiles:tiles-el:3.0.1") {
+			exclude group: "org.slf4j", module: "jcl-over-slf4j"
+		}
 		provided("javax.servlet:javax.servlet-api:3.0.1")
-		optional("javax.servlet.jsp:jsp-api:2.1")
-		optional("javax.servlet:jstl:1.2")
-		optional("javax.el:el-api:1.0")
-		optional("org.apache.tiles:tiles-api:3.0.4")
-		optional("org.apache.tiles:tiles-core:3.0.4") {
-			exclude group: "org.slf4j", module: "jcl-over-slf4j"
-		}
-		optional("org.apache.tiles:tiles-servlet:3.0.4") {
-			exclude group: "org.slf4j", module: "jcl-over-slf4j"
-		}
-		optional("org.apache.tiles:tiles-jsp:3.0.4") {
-			exclude group: "org.slf4j", module: "jcl-over-slf4j"
-		}
-		optional("org.apache.tiles:tiles-el:3.0.4") {
-			exclude group: "org.slf4j", module: "jcl-over-slf4j"
-		}
-		optional("org.apache.tiles:tiles-extras:3.0.4") {
-			exclude group: "org.slf4j", module: "jcl-over-slf4j"
-			exclude group: "org.springframework", module: "spring-web"
-		}
 		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
 	}
 }
@@ -657,14 +650,14 @@ project("spring-webmvc-portlet") {
 	description = "Spring Web Portlet"

 	dependencies {
+		provided("javax.servlet:javax.servlet-api:3.0.1")
+		provided("javax.portlet:portlet-api:2.0")
+		compile(project(":spring-core"))
 		compile(project(":spring-beans"))
 		compile(project(":spring-context"))
-		compile(project(":spring-core"))
 		compile(project(":spring-web"))
 		compile(project(":spring-webmvc"))
-		provided("javax.servlet:servlet-api:2.5")
-		provided("javax.portlet:portlet-api:2.0")
-		optional("commons-fileupload:commons-fileupload:1.3.1")
+		optional("commons-fileupload:commons-fileupload:1.2")
 	}

 	// pick up DispatcherPortlet.properties in src/main
@@ -676,7 +669,6 @@ project("spring-test") {

 	dependencies {
 		compile(project(":spring-core"))
-		provided("javax.activation:activation:1.1")
 		optional(project(":spring-beans"))
 		optional(project(":spring-context"))
 		optional(project(":spring-jdbc"))
@@ -684,40 +676,37 @@ project("spring-test") {
 		optional(project(":spring-orm"))
 		optional(project(":spring-web"))
 		optional(project(":spring-webmvc"))
-		optional(project(":spring-webmvc-portlet"))
+		optional(project(":spring-webmvc-portlet"), )
 		optional("junit:junit:${junitVersion}")
-		optional("org.testng:testng:6.8.8")
-		optional("javax.inject:javax.inject:1")
-		optional("javax.servlet:servlet-api:2.5")
+		optional("org.testng:testng:6.8.5")
+		optional("javax.servlet:javax.servlet-api:3.0.1")
 		optional("javax.servlet.jsp:jsp-api:2.1")
-		optional("javax.servlet:jstl:1.2")
 		optional("javax.portlet:portlet-api:2.0")
-		optional("javax.persistence:persistence-api:1.0")
+		optional("org.eclipse.persistence:javax.persistence:2.0.0")
 		optional("org.aspectj:aspectjweaver:${aspectjVersion}")
-		testCompile("org.hibernate:hibernate-core:3.3.2.GA")
-		testCompile("hsqldb:hsqldb:${hsqldbVersion}")
+		testCompile("org.hibernate:hibernate-core:3.6.9.Final")
+		provided("javax.inject:javax.inject:1")
+		provided("javax.activation:activation:1.1")
+		provided("javax.servlet:jstl:1.2")
 		testCompile "org.slf4j:slf4j-jcl:${slf4jVersion}"
+		testCompile("hsqldb:hsqldb:${hsqldbVersion}")
 	}

 	task testNG(type: Test) {
 		useTestNG()
-		// forkEvery 1
 		scanForTestClasses = false
-		include "**/testng/**/*.*"
+		include "**/testng/*.*"
 		exclude "**/FailingBeforeAndAfterMethodsTests.class"
 		// "TestCase" classes are run by other test classes, not the build.
 		exclude "**/*TestCase.class"
 		// Generate TestNG reports alongside JUnit reports.
-		getReports().getHtml().setEnabled(true)
-		// show standard out and standard error of the test JVM(s) on the console
-		// testLogging.showStandardStreams = true
+		testReport true
 	}

 	test {
 		dependsOn testNG
 		useJUnit()
-		exclude "**/testng/**/*.*"
-		include "**/testng/FailingBeforeAndAfterMethodsTests"
+		exclude "**/testng/*.*"
 		// "TestCase" classes are run by other test classes, not the build.
 		exclude(["**/*TestCase.class", "**/*TestSuite.class"])
 	}
@@ -726,47 +715,33 @@ project("spring-test") {
 project("spring-test-mvc") {
 	description = "Spring Test MVC Framework"
 	merge.into = project(":spring-test")
+
 	dependencies {
+		optional(project(":spring-context"))
 		provided(project(":spring-webmvc"))
 		provided("javax.servlet:javax.servlet-api:3.0.1")
-		provided("javax.activation:activation:1.1")
-		optional(project(":spring-context"))
 		optional("org.hamcrest:hamcrest-core:1.3")
 		optional("com.jayway.jsonpath:json-path:0.8.1")
 		optional("xmlunit:xmlunit:1.3")
+		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(project(":spring-context-support"))
 		testCompile(project(":spring-oxm"))
-		testCompile("javax.servlet:jstl:1.2")
-		testCompile("javax.mail:mail:1.4.7")
-		testCompile("org.hibernate:hibernate-validator:4.3.1.Final")
-		testCompile("com.thoughtworks.xstream:xstream:1.4.7")
-		testCompile("org.codehaus.jackson:jackson-mapper-asl:1.7.9")
-		testCompile("com.fasterxml.jackson.core:jackson-databind:2.0.6")
+		testCompile("com.thoughtworks.xstream:xstream:1.3.1")
 		testCompile("rome:rome:1.0")
-		testCompile("org.apache.tiles:tiles-api:3.0.4")
-		testCompile("org.apache.tiles:tiles-core:3.0.4") {
+		testCompile("javax.activation:activation:1.1")
+		testCompile("javax.mail:mail:1.4.7")
+		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") {
 			exclude group: "org.slf4j", module: "jcl-over-slf4j"
 		}
-		testCompile("org.apache.tiles:tiles-servlet:3.0.4") {
+		testCompile("org.apache.tiles:tiles-servlet:3.0.1") {
 			exclude group: "org.slf4j", module: "jcl-over-slf4j"
 		}
-		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
-	}
-}
-
-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"))
 	}
 }

@@ -775,20 +750,21 @@ project("spring-aspects") {
 	apply from: "aspects.gradle"

 	dependencies {
+		optional(project(":spring-beans")) // for @Configurable support
+		optional(project(":spring-aop")) // for @Async support
+		optional(project(":spring-context")) // for @Enable* support
+		compile(project(":spring-context-support")) // for JavaMail support
+		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")
 		ajc("org.aspectj:aspectjtools:${aspectjVersion}")
 		rt("org.aspectj:aspectjrt:${aspectjVersion}")
 		compile("org.aspectj:aspectjweaver:${aspectjVersion}")
-		provided("javax.persistence:persistence-api:1.0")
-		optional(project(":spring-aop")) // for @Async support
-		optional(project(":spring-beans")) // for @Configurable support
-		optional(project(":spring-context")) // for @Enable* support
-		optional(project(":spring-context-support")) // for JavaMail support
-		optional(project(":spring-orm")) // for JPA exception translation support
-		optional(project(":spring-tx")) // for JPA, @Transactional support
 		testCompile(project(":spring-core")) // for CodeStyleAspect
+		compile(project(":spring-beans")) // for "p" namespace visibility
 		testCompile(project(":spring-test"))
-		testCompile("javax.mail:mail:1.4.7")
 	}

 	eclipse.project {
@@ -798,47 +774,11 @@ project("spring-aspects") {
 	}
 }

-project("spring-framework-bom") {
-	description = "Spring Framework (Bill of Materials)"
-
-	configurations.archives.artifacts.clear()
-	artifacts {
-		// work around GRADLE-2406 by attaching text artifact
-		archives(file("spring-framework-bom.txt"))
-	}
-
-	install {
-		repositories.mavenInstaller {
-			pom.whenConfigured {
-				packaging = "pom"
-				withXml {
-					asNode().children().last() + {
-						delegate.dependencyManagement {
-							delegate.dependencies {
-								parent.subprojects.sort { "$it.name" }.each { p ->
-									if (p.hasProperty("merge") && p.merge.into == null && p != project) {
-										delegate.dependency {
-											delegate.groupId(p.group)
-											delegate.artifactId(p.name)
-											delegate.version(p.version)
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
 configure(rootProject) {
 	description = "Spring Framework"

 	apply plugin: "docbook-reference"
 	apply plugin: "groovy"
-
 	// apply plugin: "detect-split-packages"
 	apply from: "${gradleScriptDir}/jdiff.gradle"

@@ -848,7 +788,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 on OpenJDK 8; works fine on JDK 7.
+	// TODO: Possibly related to user rights or OS differences; passes on local Windows machine.
 	// detectSplitPackages {
 	//	projectsToScan -= project(":spring-instrument-tomcat")
 	// }
@@ -857,23 +797,23 @@ configure(rootProject) {
 	configurations.archives.artifacts.clear()

 	dependencies { // for integration tests
-		testCompile(project(":spring-aop"))
-		testCompile(project(":spring-beans"))
-		testCompile(project(":spring-context"))
 		testCompile(project(":spring-core"))
+		testCompile(project(":spring-beans"))
+		testCompile(project(":spring-aop"))
 		testCompile(project(":spring-expression"))
-		testCompile(project(":spring-jdbc"))
-		testCompile(project(":spring-orm"))
-		testCompile(project(":spring-test"))
+		testCompile(project(":spring-context"))
 		testCompile(project(":spring-tx"))
+		testCompile(project(":spring-jdbc"))
+		testCompile(project(":spring-test"))
 		testCompile(project(":spring-web"))
 		testCompile(project(":spring-webmvc-portlet"))
-		testCompile("javax.servlet:servlet-api:2.5")
+		testCompile(project(":spring-orm"))
+		testCompile("org.hibernate:hibernate-core:4.2.1.Final")
+		testCompile("javax.servlet:javax.servlet-api:3.0.1")
 		testCompile("javax.portlet:portlet-api:2.0")
 		testCompile("javax.inject:javax.inject:1")
 		testCompile("javax.resource:connector-api:1.5")
 		testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
-		testCompile("org.hibernate:hibernate-core:4.2.12.Final")
 		testCompile("hsqldb:hsqldb:${hsqldbVersion}")
 	}

@@ -894,9 +834,7 @@ configure(rootProject) {
 		options.stylesheetFile = file("src/api/stylesheet.css")
 		options.splitIndex = true
 		options.links(project.ext.javadocLinks)
-		if (JavaVersion.current().isJava8Compatible()) {
-			options.addStringOption('Xdoclint:none', '-quiet')
-		}
+		options.addStringOption('Xdoclint:none', '-quiet')

 		source subprojects.collect { project ->
 			project.sourceSets.main.allJava
@@ -907,7 +845,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" },
@@ -918,7 +856,7 @@ configure(rootProject) {
 		}
 	}

-	task docsZip(type: Zip, dependsOn: 'reference') {
+	task docsZip(type: Zip) {
 		group = "Distribution"
 		baseName = "spring-framework"
 		classifier = "docs"
@@ -1044,10 +982,10 @@ configure(rootProject) {

 	task wrapper(type: Wrapper) {
 		description = "Generates gradlew[.bat] scripts"
-		gradleVersion = "1.12"
+		gradleVersion = "1.6"

 		doLast() {
-			def gradleOpts = "-XX:MaxPermSize=1024m -Xmx1024m"
+			def gradleOpts = "-XX:MaxMetaspaceSize=1024m -Xmx1024m"
 			def gradleBatOpts = "$gradleOpts -XX:MaxHeapSize=256m"
 			File wrapperFile = file("gradlew")
 			wrapperFile.text = wrapperFile.text.replace("DEFAULT_JVM_OPTS=",
@@ -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>
+ * <pre class="code">
 * configure(subprojects) {
 *     apply plugin: MergePlugin
 * }
@@ -1 +1 @@
-version=3.2.9.RELEASE
+version=4.0.0.M2
@@ -5,6 +5,12 @@ 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)
@@ -43,7 +43,7 @@ def customizePom(pom, gradleProject) {
 				developer {
 					id = "jhoeller"
 					name = "Juergen Hoeller"
-					email = "jhoeller@gopivotal.com"
+					email = "jhoeller@vmware.com"
 				}
 			}
 		}
@@ -1,6 +1,6 @@
-#Wed Apr 30 13:06:57 CEST 2014
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
+#Mon May 13 17:38:05 CDT 2013
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionBase=GRADLE_USER_HOME
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip
@@ -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:MaxPermSize=1024m -Xmx1024m $GRADLE_OPTS"
+GRADLE_OPTS="-XX:MaxMetaspaceSize=1024m -Xmx1024m $GRADLE_OPTS"
 DEFAULT_JVM_OPTS=""

 APP_NAME="Gradle"
@@ -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:MaxPermSize=1024m -Xmx1024m -XX:MaxHeapSize=256m %GRADLE_OPTS%
+set GRADLE_OPTS=-XX:MaxMetaspaceSize=1024m -Xmx1024m -XX:MaxHeapSize=256m %GRADLE_OPTS%
 set DEFAULT_JVM_OPTS=

 set DIRNAME=%~dp0
@@ -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,7 @@ include "spring-web"
 include "spring-webmvc"
 include "spring-webmvc-portlet"
 include "spring-webmvc-tiles3"
-include "spring-framework-bom"
+include "spring-websocket"

 // Exposes gradle buildSrc for IDE support
 include "buildSrc"
@@ -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.
@@ -19,9 +19,9 @@ package org.springframework.aop;
 import java.lang.reflect.Method;

 /**
- * A specialized type of {@link MethodMatcher} that takes into account introductions
- * when matching methods. If there are no introductions on the target class,
- * a method matcher may be able to optimize matching more effectively for example.
+ * A specialized type of MethodMatcher that takes into account introductions when
+ * matching methods. If there are no introductions on the target class, a method
+ * matcher may be able to optimize matching more effectively for example.
 *
 * @author Adrian Colyer
 * @since 2.0
@@ -39,6 +39,6 @@ public interface IntroductionAwareMethodMatcher extends MethodMatcher {
 	 * asking is the subject on one or more introductions; {@code false} otherwise
 	 * @return whether or not this method matches statically
 	 */
-	boolean matches(Method method, Class<?> targetClass, boolean hasIntroductions);
+	boolean matches(Method method, Class targetClass, boolean hasIntroductions);

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

 	/**
@@ -34,6 +34,7 @@ class TrueClassFilter implements ClassFilter, Serializable {
 	private TrueClassFilter() {
 	}

+	@Override
 	public boolean matches(Class clazz) {
 		return true;
 	}
@@ -35,14 +35,17 @@ 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();
@@ -34,10 +34,12 @@ class TruePointcut implements Pointcut, Serializable {
 	private TruePointcut() {
 	}

+	@Override
 	public ClassFilter getClassFilter() {
 		return ClassFilter.TRUE;
 	}

+	@Override
 	public MethodMatcher getMethodMatcher() {
 		return MethodMatcher.TRUE;
 	}
@@ -203,6 +203,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 		return this.aspectInstanceFactory.getAspectClassLoader();
 	}

+	@Override
 	public int getOrder() {
 		return this.aspectInstanceFactory.getOrder();
 	}
@@ -212,6 +213,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 		this.aspectName = name;
 	}

+	@Override
 	public String getAspectName() {
 		return this.aspectName;
 	}
@@ -223,6 +225,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 		this.declarationOrder = order;
 	}

+	@Override
 	public int getDeclarationOrder() {
 		return this.declarationOrder;
 	}
@@ -678,6 +681,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 			this.adviceMethod = adviceMethod;
 		}

+		@Override
 		public boolean matches(Method method, Class targetClass) {
 			return !this.adviceMethod.equals(method);
 		}
@@ -222,6 +222,7 @@ 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;
@@ -309,6 +310,7 @@ 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");
@@ -37,6 +37,7 @@ public class AspectJAfterAdvice extends AbstractAspectJAdvice implements MethodI
 		super(aspectJBeforeAdviceMethod, pointcut, aif);
 	}

+	@Override
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		try {
 			return mi.proceed();
@@ -46,10 +47,12 @@ public class AspectJAfterAdvice extends AbstractAspectJAdvice implements MethodI
 		}
 	}

+	@Override
 	public boolean isBeforeAdvice() {
 		return false;
 	}

+	@Override
 	public boolean isAfterAdvice() {
 		return true;
 	}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 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.
@@ -40,10 +40,12 @@ public class AspectJAfterReturningAdvice extends AbstractAspectJAdvice implement
 		super(aspectJBeforeAdviceMethod, pointcut, aif);
 	}

+	@Override
 	public boolean isBeforeAdvice() {
 		return false;
 	}

+	@Override
 	public boolean isAfterAdvice() {
 		return true;
 	}
@@ -53,6 +55,7 @@ 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);
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 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,10 +37,12 @@ public class AspectJAfterThrowingAdvice extends AbstractAspectJAdvice implements
 		super(aspectJBeforeAdviceMethod, pointcut, aif);
 	}

+	@Override
 	public boolean isBeforeAdvice() {
 		return false;
 	}

+	@Override
 	public boolean isAfterAdvice() {
 		return true;
 	}
@@ -50,6 +52,7 @@ public class AspectJAfterThrowingAdvice extends AbstractAspectJAdvice implements
 		setThrowingNameNoCheck(name);
 	}

+	@Override
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		try {
 			return mi.proceed();
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 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.
@@ -41,10 +41,12 @@ public class AspectJAroundAdvice extends AbstractAspectJAdvice implements Method
 		super(aspectJAroundAdviceMethod, pointcut, aif);
 	}

+	@Override
 	public boolean isBeforeAdvice() {
 		return false;
 	}

+	@Override
 	public boolean isAfterAdvice() {
 		return false;
 	}
@@ -55,6 +57,7 @@ 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);
@@ -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.
@@ -29,6 +29,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.aspectj.weaver.BCException;
 import org.aspectj.weaver.patterns.NamePattern;
+import org.aspectj.weaver.reflect.ReflectionWorld;
 import org.aspectj.weaver.reflect.ReflectionWorld.ReflectionWorldException;
 import org.aspectj.weaver.reflect.ShadowMatchImpl;
 import org.aspectj.weaver.tools.ContextBasedMatcher;
@@ -41,7 +42,6 @@ import org.aspectj.weaver.tools.PointcutParameter;
 import org.aspectj.weaver.tools.PointcutParser;
 import org.aspectj.weaver.tools.PointcutPrimitive;
 import org.aspectj.weaver.tools.ShadowMatch;
-
 import org.springframework.aop.ClassFilter;
 import org.springframework.aop.IntroductionAwareMethodMatcher;
 import org.springframework.aop.MethodMatcher;
@@ -55,7 +55,6 @@ import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;

@@ -99,16 +98,14 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut

 	private static final Log logger = LogFactory.getLog(AspectJExpressionPointcut.class);

-	private Class<?> pointcutDeclarationScope;
+	private Class pointcutDeclarationScope;

 	private String[] pointcutParameterNames = new String[0];

-	private Class<?>[] pointcutParameterTypes = new Class<?>[0];
+	private Class[] pointcutParameterTypes = new Class[0];

 	private BeanFactory beanFactory;

-	private transient ClassLoader pointcutClassLoader;
-
 	private transient PointcutExpression pointcutExpression;

 	private transient Map<Method, ShadowMatch> shadowMatchCache = new ConcurrentHashMap<Method, ShadowMatch>(32);
@@ -126,7 +123,7 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 	 * @param paramNames the parameter names for the pointcut
 	 * @param paramTypes the parameter types for the pointcut
 	 */
-	public AspectJExpressionPointcut(Class<?> declarationScope, String[] paramNames, Class<?>[] paramTypes) {
+	public AspectJExpressionPointcut(Class declarationScope, String[] paramNames, Class[] paramTypes) {
 		this.pointcutDeclarationScope = declarationScope;
 		if (paramNames.length != paramTypes.length) {
 			throw new IllegalStateException(
@@ -140,34 +137,37 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 	/**
 	 * Set the declaration scope for the pointcut.
 	 */
-	public void setPointcutDeclarationScope(Class<?> pointcutDeclarationScope) {
+	public void setPointcutDeclarationScope(Class pointcutDeclarationScope) {
 		this.pointcutDeclarationScope = pointcutDeclarationScope;
 	}

 	/**
 	 * Set the parameter names for the pointcut.
 	 */
-	public void setParameterNames(String... names) {
+	public void setParameterNames(String[] names) {
 		this.pointcutParameterNames = names;
 	}

 	/**
 	 * Set the parameter types for the pointcut.
 	 */
-	public void setParameterTypes(Class<?>... types) {
+	public void setParameterTypes(Class[] types) {
 		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;
@@ -183,13 +183,20 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 			throw new IllegalStateException("Must set property 'expression' before attempting to match");
 		}
 		if (this.pointcutExpression == null) {
-			this.pointcutClassLoader = (this.beanFactory instanceof ConfigurableBeanFactory ?
-					((ConfigurableBeanFactory) this.beanFactory).getBeanClassLoader() :
-					ClassUtils.getDefaultClassLoader());
-			this.pointcutExpression = buildPointcutExpression(this.pointcutClassLoader);
+			this.pointcutExpression = buildPointcutExpression();
 		}
 	}

+	/**
+	 * Build the underlying AspectJ pointcut expression.
+	 */
+	private PointcutExpression buildPointcutExpression() {
+		ClassLoader cl = (this.beanFactory instanceof ConfigurableBeanFactory ? ((ConfigurableBeanFactory) this.beanFactory)
+				.getBeanClassLoader() : Thread.currentThread()
+				.getContextClassLoader());
+		return buildPointcutExpression(cl);
+	}
+
 	/**
 	 * Build the underlying AspectJ pointcut expression.
 	 */
@@ -198,7 +205,8 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 		PointcutParameter[] pointcutParameters = new PointcutParameter[this.pointcutParameterNames.length];
 		for (int i = 0; i < pointcutParameters.length; i++) {
 			pointcutParameters[i] = parser.createPointcutParameter(
-					this.pointcutParameterNames[i], this.pointcutParameterTypes[i]);
+					this.pointcutParameterNames[i],
+					this.pointcutParameterTypes[i]);
 		}
 		return parser.parsePointcutExpression(
 				replaceBooleanOperators(getExpression()),
@@ -239,28 +247,32 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 		return this.pointcutExpression;
 	}

-	public boolean matches(Class<?> targetClass) {
+	@Override
+	public boolean matches(Class targetClass) {
 		checkReadyToMatch();
 		try {
+			return this.pointcutExpression.couldMatchJoinPointsInType(targetClass);
+		} catch (ReflectionWorldException e) {
+			logger.debug("PointcutExpression matching rejected target class", e);
 			try {
-				return this.pointcutExpression.couldMatchJoinPointsInType(targetClass);
-			}
-			catch (ReflectionWorldException ex) {
-				logger.debug("PointcutExpression matching rejected target class - trying fallback expression", ex);
-				// Actually this is still a "maybe" - treat the pointcut as dynamic if we don't know enough yet
-				PointcutExpression fallbackExpression = getFallbackPointcutExpression(targetClass);
-				if (fallbackExpression != null) {
-					return fallbackExpression.couldMatchJoinPointsInType(targetClass);
-				}
+				// Actually this is still a "maybe" - treat the pointcut as dynamic if we
+				// don't know enough yet
+				return getFallbackPointcutExpression(targetClass).couldMatchJoinPointsInType(targetClass);
+			} catch (BCException ex) {
+				logger.debug(
+						"Fallback PointcutExpression matching rejected target class",
+						ex);
+				return false;
 			}
 		}
 		catch (BCException ex) {
 			logger.debug("PointcutExpression matching rejected target class", ex);
+			return false;
 		}
-		return false;
 	}

-	public boolean matches(Method method, Class<?> targetClass, boolean beanHasIntroductions) {
+	@Override
+	public boolean matches(Method method, Class targetClass, boolean beanHasIntroductions) {
 		checkReadyToMatch();
 		Method targetMethod = AopUtils.getMostSpecificMethod(method, targetClass);
 		ShadowMatch shadowMatch = getShadowMatch(targetMethod, method);
@@ -276,28 +288,23 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 		}
 		else {
 			// the maybe case
-			if (beanHasIntroductions) {
-				return true;
-			}
-			// A match test returned maybe - if there are any subtype sensitive variables
-			// involved in the test (this, target, at_this, at_target, at_annotation) then
-			// we say this is not a match as in Spring there will never be a different
-			// runtime subtype.
-			RuntimeTestWalker walker = getRuntimeTestWalker(shadowMatch);
-			return (!walker.testsSubtypeSensitiveVars() || walker.testTargetInstanceOfResidue(targetClass));
+			return (beanHasIntroductions || matchesIgnoringSubtypes(shadowMatch) || matchesTarget(shadowMatch, targetClass));
 		}
 	}

-	public boolean matches(Method method, Class<?> targetClass) {
+	@Override
+	public boolean matches(Method method, Class targetClass) {
 		return matches(method, targetClass, false);
 	}

+	@Override
 	public boolean isRuntime() {
 		checkReadyToMatch();
 		return this.pointcutExpression.mayNeedDynamicTest();
 	}

-	public boolean matches(Method method, Class<?> targetClass, Object[] args) {
+	@Override
+	public boolean matches(Method method, Class targetClass, Object[] args) {
 		checkReadyToMatch();
 		ShadowMatch shadowMatch = getShadowMatch(AopUtils.getMostSpecificMethod(method, targetClass), method);
 		ShadowMatch originalShadowMatch = getShadowMatch(method, method);
@@ -337,37 +344,46 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 			if (!originalMethodResidueTest.testThisInstanceOfResidue(thisObject.getClass())) {
 				return false;
 			}
-			if (joinPointMatch.matches()) {
-				bindParameters(pmi, joinPointMatch);
-			}
+		}
+		if (joinPointMatch.matches() && pmi != null) {
+			bindParameters(pmi, joinPointMatch);
 		}
 		return joinPointMatch.matches();
 	}

+
 	protected String getCurrentProxiedBeanName() {
 		return ProxyCreationContext.getCurrentProxiedBeanName();
 	}


 	/**
-	 * Get a new pointcut expression based on a target class's loader rather than the default.
+	 * Get a new pointcut expression based on a target class's loader, rather
+	 * than the default.
 	 */
-	private PointcutExpression getFallbackPointcutExpression(Class<?> targetClass) {
-		try {
-			ClassLoader classLoader = targetClass.getClassLoader();
-			if (classLoader != null && classLoader != this.pointcutClassLoader) {
-				return buildPointcutExpression(classLoader);
-			}
-		}
-		catch (Throwable ex) {
-			logger.debug("Failed to create fallback PointcutExpression", ex);
-		}
-		return null;
+	private PointcutExpression getFallbackPointcutExpression(
+			Class<?> targetClass) {
+		ClassLoader classLoader = targetClass.getClassLoader();
+		return classLoader == null ? this.pointcutExpression : buildPointcutExpression(classLoader);
+	}
+
+	/**
+	 * A match test returned maybe - if there are any subtype sensitive variables
+	 * involved in the test (this, target, at_this, at_target, at_annotation) then
+	 * we say this is not a match as in Spring there will never be a different
+	 * runtime subtype.
+	 */
+	private boolean matchesIgnoringSubtypes(ShadowMatch shadowMatch) {
+		return !(getRuntimeTestWalker(shadowMatch).testsSubtypeSensitiveVars());
+	}
+
+	private boolean matchesTarget(ShadowMatch shadowMatch, Class targetClass) {
+		return getRuntimeTestWalker(shadowMatch).testTargetInstanceOfResidue(targetClass);
 	}

 	private RuntimeTestWalker getRuntimeTestWalker(ShadowMatch shadowMatch) {
 		if (shadowMatch instanceof DefensiveShadowMatch) {
-			return new RuntimeTestWalker(((DefensiveShadowMatch) shadowMatch).primary);
+			return new RuntimeTestWalker(((DefensiveShadowMatch)shadowMatch).primary);
 		}
 		return new RuntimeTestWalker(shadowMatch);
 	}
@@ -388,51 +404,44 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 		if (shadowMatch == null) {
 			synchronized (this.shadowMatchCache) {
 				// Not found - now check again with full lock...
-				PointcutExpression fallbackExpression = null;
 				Method methodToMatch = targetMethod;
-				shadowMatch = this.shadowMatchCache.get(targetMethod);
+				PointcutExpression fallbackPointcutExpression = null;
+				shadowMatch = this.shadowMatchCache.get(methodToMatch);
 				if (shadowMatch == null) {
 					try {
-						shadowMatch = this.pointcutExpression.matchesMethodExecution(methodToMatch);
+						shadowMatch = this.pointcutExpression.matchesMethodExecution(targetMethod);
 					}
-					catch (ReflectionWorldException ex) {
+					catch (ReflectionWorld.ReflectionWorldException ex) {
 						// Failed to introspect target method, probably because it has been loaded
-						// in a special ClassLoader. Let's try the declaring ClassLoader instead...
+						// in a special ClassLoader. Let's try the original method instead...
 						try {
-							fallbackExpression = getFallbackPointcutExpression(methodToMatch.getDeclaringClass());
-							if (fallbackExpression != null) {
-								shadowMatch = fallbackExpression.matchesMethodExecution(methodToMatch);
+							fallbackPointcutExpression = getFallbackPointcutExpression(methodToMatch.getDeclaringClass());
+							shadowMatch = fallbackPointcutExpression.matchesMethodExecution(methodToMatch);
+						} catch (ReflectionWorld.ReflectionWorldException e) {
+							if (targetMethod == originalMethod) {
+								shadowMatch = new ShadowMatchImpl(org.aspectj.util.FuzzyBoolean.NO, null, null, null);
 							}
-						}
-						catch (ReflectionWorldException ex2) {
-							fallbackExpression = null;
-						}
-					}
-					if (shadowMatch == null && targetMethod != originalMethod) {
-						methodToMatch = originalMethod;
-						try {
-							shadowMatch = this.pointcutExpression.matchesMethodExecution(methodToMatch);
-						}
-						catch (ReflectionWorldException ex3) {
-							// Could neither introspect the target class nor the proxy class ->
-							// let's try the original method's declaring class before we give up...
-							try {
-								fallbackExpression = getFallbackPointcutExpression(methodToMatch.getDeclaringClass());
-								if (fallbackExpression != null) {
-									shadowMatch = fallbackExpression.matchesMethodExecution(methodToMatch);
+							else {
+								try {
+									shadowMatch = this.pointcutExpression.matchesMethodExecution(originalMethod);
+								}
+								catch (ReflectionWorld.ReflectionWorldException ex2) {
+									// Could neither introspect the target class nor the proxy class ->
+									// let's simply consider this method as non-matching.
+									methodToMatch = originalMethod;
+									fallbackPointcutExpression = getFallbackPointcutExpression(methodToMatch.getDeclaringClass());
+									try {
+										shadowMatch = fallbackPointcutExpression.matchesMethodExecution(methodToMatch);
+									} catch (ReflectionWorld.ReflectionWorldException e2) {
+										shadowMatch = new ShadowMatchImpl(org.aspectj.util.FuzzyBoolean.NO, null, null, null);
+									}
 								}
 							}
-							catch (ReflectionWorldException ex4) {
-								fallbackExpression = null;
-							}
 						}
 					}
-					if (shadowMatch == null) {
-						shadowMatch = new ShadowMatchImpl(org.aspectj.util.FuzzyBoolean.NO, null, null, null);
-					}
-					else if (shadowMatch.maybeMatches() && fallbackExpression != null) {
+					if (shadowMatch.maybeMatches() && fallbackPointcutExpression!=null) {
 						shadowMatch = new DefensiveShadowMatch(shadowMatch,
-								fallbackExpression.matchesMethodExecution(methodToMatch));
+								fallbackPointcutExpression.matchesMethodExecution(methodToMatch));
 					}
 					this.shadowMatchCache.put(targetMethod, shadowMatch);
 				}
@@ -505,10 +514,12 @@ 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);
 		}
@@ -530,27 +541,32 @@ 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;
 		}

-		private FuzzyBoolean contextMatch(Class<?> targetType) {
+		private FuzzyBoolean contextMatch(Class targetType) {
 			String advisedBeanName = getCurrentProxiedBeanName();
 			if (advisedBeanName == null) {  // no proxy creation in progress
 				// abstain; can't return YES, since that will make pointcut with negation fail
@@ -600,11 +616,9 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 		this.shadowMatchCache = new ConcurrentHashMap<Method, ShadowMatch>(32);
 	}

-
 	private static class DefensiveShadowMatch implements ShadowMatch {

 		private final ShadowMatch primary;
-
 		private final ShadowMatch other;

 		public DefensiveShadowMatch(ShadowMatch primary, ShadowMatch other) {
@@ -612,31 +626,37 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 			this.other = other;
 		}

+		@Override
 		public boolean alwaysMatches() {
-			return this.primary.alwaysMatches();
+			return primary.alwaysMatches();
 		}

+		@Override
 		public boolean maybeMatches() {
-			return this.primary.maybeMatches();
+			return primary.maybeMatches();
 		}

+		@Override
 		public boolean neverMatches() {
-			return this.primary.neverMatches();
+			return primary.neverMatches();
 		}

-		public JoinPointMatch matchesJoinPoint(Object thisObject, Object targetObject, Object[] args) {
+		@Override
+		public JoinPointMatch matchesJoinPoint(Object thisObject,
+				Object targetObject, Object[] args) {
 			try {
-				return this.primary.matchesJoinPoint(thisObject, targetObject, args);
-			}
-			catch (ReflectionWorldException ex) {
-				return this.other.matchesJoinPoint(thisObject, targetObject, args);
+				return primary.matchesJoinPoint(thisObject, targetObject, args);
+			} catch (ReflectionWorldException e) {
+				return other.matchesJoinPoint(thisObject, targetObject, args);
 			}
 		}

+		@Override
 		public void setMatchingContext(MatchingContext aMatchContext) {
-			this.primary.setMatchingContext(aMatchContext);
-			this.other.setMatchingContext(aMatchContext);
+			primary.setMatchingContext(aMatchContext);
+			other.setMatchingContext(aMatchContext);
 		}
+
 	}

 }
@@ -31,6 +31,7 @@ public class AspectJExpressionPointcutAdvisor extends AbstractGenericPointcutAdv
 	private final AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();


+	@Override
 	public Pointcut getPointcut() {
 		return this.pointcut;
 	}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 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.
@@ -35,14 +35,17 @@ 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;
 	}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 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.
@@ -56,18 +56,22 @@ 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;
@@ -48,6 +48,7 @@ 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) {
@@ -87,15 +88,18 @@ 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...
 	}
@@ -77,6 +77,7 @@ public class DeclareParentsAdvisor implements IntroductionAdvisor {

 		// Excludes methods implemented.
 		ClassFilter exclusion = new ClassFilter() {
+			@Override
 			public boolean matches(Class clazz) {
 				return !(introducedInterface.isAssignableFrom(clazz));
 			}
@@ -87,22 +88,27 @@ 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};
 	}
@@ -72,14 +72,17 @@ 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) {
@@ -94,6 +97,7 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint,
 	/**
 	 * Returns the Spring AOP proxy. Cannot be {@code null}.
 	 */
+	@Override
 	public Object getThis() {
 		return this.methodInvocation.getProxy();
 	}
@@ -101,10 +105,12 @@ 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();
@@ -114,6 +120,7 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint,
 		return this.defensiveCopyOfArgs;
 	}

+	@Override
 	public Signature getSignature() {
 		if (this.signature == null) {
 			this.signature = new MethodSignatureImpl();
@@ -121,6 +128,7 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint,
 		return signature;
 	}

+	@Override
 	public SourceLocation getSourceLocation() {
 		if (this.sourceLocation == null) {
 			this.sourceLocation = new SourceLocationImpl();
@@ -128,27 +136,33 @@ 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() + ")";
 	}
@@ -161,34 +175,42 @@ 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 = (new LocalVariableTableParameterNameDiscoverer()).getParameterNames(getMethod());
@@ -196,18 +218,22 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint,
 			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);
 		}
@@ -267,6 +293,7 @@ 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");
@@ -274,14 +301,17 @@ 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();
 		}
@@ -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.
@@ -18,8 +18,6 @@ package org.springframework.aop.aspectj;

 import java.lang.reflect.Field;

-import org.aspectj.weaver.ReferenceType;
-import org.aspectj.weaver.ReferenceTypeDelegate;
 import org.aspectj.weaver.ResolvedType;
 import org.aspectj.weaver.ast.And;
 import org.aspectj.weaver.ast.Call;
@@ -32,7 +30,6 @@ import org.aspectj.weaver.ast.Not;
 import org.aspectj.weaver.ast.Or;
 import org.aspectj.weaver.ast.Test;
 import org.aspectj.weaver.internal.tools.MatchingContextBasedTest;
-import org.aspectj.weaver.reflect.ReflectionBasedReferenceTypeDelegate;
 import org.aspectj.weaver.reflect.ReflectionVar;
 import org.aspectj.weaver.reflect.ShadowMatchImpl;
 import org.aspectj.weaver.tools.ShadowMatch;
@@ -58,36 +55,25 @@ import org.springframework.util.ReflectionUtils;
 */
 class RuntimeTestWalker {

-	private static final Field residualTestField;
-
-	private static final Field varTypeField;
-
-	private static final Field myClassField;
-
-
-	static {
-		try {
-			residualTestField = ShadowMatchImpl.class.getDeclaredField("residualTest");
-			varTypeField = ReflectionVar.class.getDeclaredField("varType");
-			myClassField = ReflectionBasedReferenceTypeDelegate.class.getDeclaredField("myClass");
-		}
-		catch (NoSuchFieldException ex) {
-			throw new IllegalStateException("The version of aspectjtools.jar / aspectjweaver.jar " +
-					"on the classpath is incompatible with this version of Spring: " + ex);
-		}
-	}
-
-
 	private final Test runtimeTest;


 	public RuntimeTestWalker(ShadowMatch shadowMatch) {
+		ShadowMatchImpl shadowMatchImplementation = (ShadowMatchImpl) shadowMatch;
 		try {
-			ReflectionUtils.makeAccessible(residualTestField);
-			this.runtimeTest = (Test) residualTestField.get(shadowMatch);
+			Field testField = shadowMatchImplementation.getClass().getDeclaredField("residualTest");
+			ReflectionUtils.makeAccessible(testField);
+			this.runtimeTest = (Test) testField.get(shadowMatch);
 		}
-		catch (IllegalAccessException ex) {
-			throw new IllegalStateException(ex);
+		catch (NoSuchFieldException noSuchFieldEx) {
+			throw new IllegalStateException("The version of aspectjtools.jar / aspectjweaver.jar " +
+					"on the classpath is incompatible with this version of Spring: Expected field " +
+					"'runtimeTest' is not present on ShadowMatchImpl class.");
+		}
+		catch (IllegalAccessException illegalAccessEx) {
+			// Famous last words... but I don't see how this can happen given the
+			// makeAccessible call above
+			throw new IllegalStateException("Unable to access ShadowMatchImpl.residualTest field");
 		}
 	}

@@ -101,12 +87,12 @@ class RuntimeTestWalker {
 				new SubtypeSensitiveVarTypeTestVisitor().testsSubtypeSensitiveVars(this.runtimeTest));
 	}

-	public boolean testThisInstanceOfResidue(Class<?> thisClass) {
+	public boolean testThisInstanceOfResidue(Class thisClass) {
 		return (this.runtimeTest != null &&
 				new ThisInstanceOfResidueTestVisitor(thisClass).thisInstanceOfMatches(this.runtimeTest));
 	}

-	public boolean testTargetInstanceOfResidue(Class<?> targetClass) {
+	public boolean testTargetInstanceOfResidue(Class targetClass) {
 		return (this.runtimeTest != null &&
 				new TargetInstanceOfResidueTestVisitor(targetClass).targetInstanceOfMatches(this.runtimeTest));
 	}
@@ -120,45 +106,62 @@ 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) {
 		}

 		protected int getVarType(ReflectionVar v) {
 			try {
+				Field varTypeField = ReflectionVar.class.getDeclaredField("varType");
 				ReflectionUtils.makeAccessible(varTypeField);
 				return (Integer) varTypeField.get(v);
 			}
-			catch (IllegalAccessException ex) {
-				throw new IllegalStateException(ex);
+			catch (NoSuchFieldException noSuchFieldEx) {
+				throw new IllegalStateException("the version of aspectjtools.jar / aspectjweaver.jar " +
+						"on the classpath is incompatible with this version of Spring:- expected field " +
+						"'varType' is not present on ReflectionVar class");
+			}
+			catch (IllegalAccessException illegalAccessEx) {
+				// Famous last words... but I don't see how this can happen given the
+				// makeAccessible call above
+				throw new IllegalStateException("Unable to access ReflectionVar.varType field");
 			}
 		}
 	}
@@ -166,13 +169,11 @@ class RuntimeTestWalker {

 	private static abstract class InstanceOfResidueTestVisitor extends TestVisitorAdapter {

-		private final Class<?> matchClass;
-
+		private Class matchClass;
 		private boolean matches;
+		private int matchVarType;

-		private final int matchVarType;
-
-		public InstanceOfResidueTestVisitor(Class<?> matchClass, boolean defaultMatches, int matchVarType) {
+		public InstanceOfResidueTestVisitor(Class matchClass, boolean defaultMatches, int matchVarType) {
 			this.matchClass = matchClass;
 			this.matches = defaultMatches;
 			this.matchVarType = matchVarType;
@@ -180,34 +181,19 @@ class RuntimeTestWalker {

 		public boolean instanceOfMatches(Test test) {
 			test.accept(this);
-			return this.matches;
+			return matches;
 		}

 		@Override
 		public void visit(Instanceof i) {
+			ResolvedType type = (ResolvedType) i.getType();
 			int varType = getVarType((ReflectionVar) i.getVar());
 			if (varType != this.matchVarType) {
 				return;
 			}
-			Class<?> typeClass = null;
-			ResolvedType type = (ResolvedType) i.getType();
-			if (type instanceof ReferenceType) {
-				ReferenceTypeDelegate delegate = ((ReferenceType) type).getDelegate();
-				if (delegate instanceof ReflectionBasedReferenceTypeDelegate) {
-					try {
-						ReflectionUtils.makeAccessible(myClassField);
-						typeClass = (Class<?>) myClassField.get(delegate);
-					}
-					catch (IllegalAccessException ex) {
-						throw new IllegalStateException(ex);
-					}
-				}
-			}
 			try {
-				// Don't use ResolvedType.isAssignableFrom() as it won't be aware of (Spring) mixins
-				if (typeClass == null) {
-					typeClass = ClassUtils.forName(type.getName(), this.matchClass.getClassLoader());
-				}
+				Class typeClass = ClassUtils.forName(type.getName(), this.matchClass.getClassLoader());
+				// Don't use ReflectionType.isAssignableFrom() as it won't be aware of (Spring) mixins
 				this.matches = typeClass.isAssignableFrom(this.matchClass);
 			}
 			catch (ClassNotFoundException ex) {
@@ -222,7 +208,7 @@ class RuntimeTestWalker {
 	 */
 	private static class TargetInstanceOfResidueTestVisitor extends InstanceOfResidueTestVisitor {

-		public TargetInstanceOfResidueTestVisitor(Class<?> targetClass) {
+		public TargetInstanceOfResidueTestVisitor(Class targetClass) {
 			super(targetClass, false, TARGET_VAR);
 		}

@@ -237,7 +223,7 @@ class RuntimeTestWalker {
 	 */
 	private static class ThisInstanceOfResidueTestVisitor extends InstanceOfResidueTestVisitor {

-		public ThisInstanceOfResidueTestVisitor(Class<?> thisClass) {
+		public ThisInstanceOfResidueTestVisitor(Class thisClass) {
 			super(thisClass, true, THIS_VAR);
 		}

@@ -251,11 +237,8 @@ class RuntimeTestWalker {
 	private static class SubtypeSensitiveVarTypeTestVisitor extends TestVisitorAdapter {

 		private final Object thisObj = new Object();
-
 		private final Object targetObj = new Object();
-
 		private final Object[] argsObjs = new Object[0];
-
 		private boolean testsSubtypeSensitiveVars = false;

 		public boolean testsSubtypeSensitiveVars(Test aTest) {
@@ -266,8 +249,8 @@ class RuntimeTestWalker {
 		@Override
 		public void visit(Instanceof i) {
 			ReflectionVar v = (ReflectionVar) i.getVar();
-			Object varUnderTest = v.getBindingAtJoinPoint(this.thisObj, this.targetObj, this.argsObjs);
-			if (varUnderTest == this.thisObj || varUnderTest == this.targetObj) {
+			Object varUnderTest = v.getBindingAtJoinPoint(thisObj,targetObj,argsObjs);
+			if ((varUnderTest == thisObj) || (varUnderTest == targetObj)) {
 				this.testsSubtypeSensitiveVars = true;
 			}
 		}
@@ -277,7 +260,7 @@ class RuntimeTestWalker {
 			// If you thought things were bad before, now we sink to new levels of horror...
 			ReflectionVar v = (ReflectionVar) hasAnn.getVar();
 			int varType = getVarType(v);
-			if (varType == AT_THIS_VAR || varType == AT_TARGET_VAR || varType == AT_ANNOTATION_VAR) {
+				if ((varType == AT_THIS_VAR) || (varType == AT_TARGET_VAR) || (varType == AT_ANNOTATION_VAR)) {
 				this.testsSubtypeSensitiveVars = true;
 			}
 		}
@@ -49,6 +49,7 @@ public class SimpleAspectInstanceFactory implements AspectInstanceFactory {
 	}


+	@Override
 	public final Object getAspectInstance() {
 		try {
 			return this.aspectClass.newInstance();
@@ -61,6 +62,7 @@ public class SimpleAspectInstanceFactory implements AspectInstanceFactory {
 		}
 	}

+	@Override
 	public ClassLoader getAspectClassLoader() {
 		return this.aspectClass.getClassLoader();
 	}
@@ -73,6 +75,7 @@ public class SimpleAspectInstanceFactory implements AspectInstanceFactory {
 	 * @see org.springframework.core.Ordered
 	 * @see #getOrderForAspectClass
 	 */
+	@Override
 	public int getOrder() {
 		return getOrderForAspectClass(this.aspectClass);
 	}
@@ -44,10 +44,12 @@ public class SingletonAspectInstanceFactory implements AspectInstanceFactory {
 	}


+	@Override
 	public final Object getAspectInstance() {
 		return this.aspectInstance;
 	}

+	@Override
 	public ClassLoader getAspectClassLoader() {
 		return this.aspectInstance.getClass().getClassLoader();
 	}
@@ -60,6 +62,7 @@ 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();
@@ -93,6 +93,7 @@ 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.");
@@ -111,6 +111,7 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
 	 * 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));
 	}
@@ -135,6 +136,7 @@ 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 &&
@@ -309,6 +311,7 @@ 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];
@@ -330,6 +333,7 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
 			}
 		}

+		@Override
 		public String[] getParameterNames(Constructor ctor) {
 			throw new UnsupportedOperationException("Spring AOP cannot handle constructor advice");
 		}
@@ -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.
@@ -67,7 +67,7 @@ public class AnnotationAwareAspectJAutoProxyCreator extends AspectJAwareAdvisorA
 	}

 	public void setAspectJAdvisorFactory(AspectJAdvisorFactory aspectJAdvisorFactory) {
-		Assert.notNull(aspectJAdvisorFactory, "AspectJAdvisorFactory must not be null");
+		Assert.notNull(this.aspectJAdvisorFactory, "AspectJAdvisorFactory must not be null");
 		this.aspectJAdvisorFactory = aspectJAdvisorFactory;
 	}

@@ -89,7 +89,7 @@ public class AnnotationAwareAspectJAutoProxyCreator extends AspectJAwareAdvisorA
 	}

 	@Override
-	protected boolean isInfrastructureClass(Class<?> beanClass) {
+	protected boolean isInfrastructureClass(Class beanClass) {
 		// Previously we setProxyTargetClass(true) in the constructor, but that has too
 		// broad an impact. Instead we now override isInfrastructureClass to avoid proxying
 		// aspects. I'm not entirely happy with that as there is no good reason not
@@ -73,10 +73,12 @@ 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();
@@ -86,6 +88,7 @@ public class BeanFactoryAspectInstanceFactory implements MetadataAwareAspectInst
 		}
 	}

+	@Override
 	public AspectMetadata getAspectMetadata() {
 		return this.aspectMetadata;
 	}
@@ -100,6 +103,7 @@ 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) {
@@ -97,6 +97,7 @@ 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;
 	}
@@ -106,6 +107,7 @@ 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);
 	}
@@ -120,6 +122,7 @@ class InstantiationModelAwarePointcutAdvisorImpl
 	/**
 	 * Lazily instantiate advice if necessary.
 	 */
+	@Override
 	public synchronized Advice getAdvice() {
 		if (this.instantiatedAdvice == null) {
 			this.instantiatedAdvice = instantiateAdvice(this.declaredPointcut);
@@ -127,10 +130,12 @@ class InstantiationModelAwarePointcutAdvisorImpl
 		return this.instantiatedAdvice;
 	}

+	@Override
 	public boolean isLazy() {
 		return this.lazy;
 	}

+	@Override
 	public synchronized boolean isAdviceInstantiated() {
 		return (this.instantiatedAdvice != null);
 	}
@@ -149,18 +154,22 @@ 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();
@@ -168,6 +177,7 @@ class InstantiationModelAwarePointcutAdvisorImpl
 		return this.isBeforeAdvice;
 	}

+	@Override
 	public boolean isAfterAdvice() {
 		if (this.isAfterAdvice == null) {
 			determineAdviceType();
@@ -245,6 +255,7 @@ 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));
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 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.
@@ -42,6 +42,7 @@ public class LazySingletonAspectInstanceFactoryDecorator implements MetadataAwar
 	}


+	@Override
 	public synchronized Object getAspectInstance() {
 		if (this.materialized == null) {
 			synchronized (this) {
@@ -57,14 +58,17 @@ 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();
 	}
@@ -75,6 +75,7 @@ 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();
@@ -82,6 +83,7 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 				}));
 		comparator.addComparator(new ConvertingComparator<Method, String>(
 				new Converter<Method, String>() {
+					@Override
 					public String convert(Method method) {
 						return method.getName();
 					}
@@ -90,6 +92,7 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 	}


+	@Override
 	public List<Advisor> getAdvisors(MetadataAwareAspectInstanceFactory maaif) {
 		final Class<?> aspectClass = maaif.getAspectMetadata().getAspectClass();
 		final String aspectName = maaif.getAspectMetadata().getAspectName();
@@ -128,6 +131,7 @@ 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) {
@@ -164,6 +168,7 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 	}


+	@Override
 	public Advisor getAdvisor(Method candidateAdviceMethod, MetadataAwareAspectInstanceFactory aif,
 			int declarationOrderInAspect, String aspectName) {

@@ -191,6 +196,7 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 	}


+	@Override
 	public Advice getAdvice(Method candidateAdviceMethod, AspectJExpressionPointcut ajexp,
 			MetadataAwareAspectInstanceFactory aif, int declarationOrderInAspect, String aspectName) {

@@ -272,6 +278,7 @@ 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();
@@ -46,6 +46,7 @@ public class SimpleMetadataAwareAspectInstanceFactory extends SimpleAspectInstan
 	}


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


+	@Override
 	public final AspectMetadata getAspectMetadata() {
 		return this.metadata;
 	}
@@ -126,11 +126,13 @@ 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;
 		}
@@ -75,6 +75,7 @@ class AspectJPrecedenceComparator implements Comparator {
 	}


+	@Override
 	public int compare(Object o1, Object o2) {
 		if (!(o1 instanceof Advisor && o2 instanceof Advisor)) {
 			throw new IllegalArgumentException(
@@ -58,6 +58,7 @@ 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();

@@ -91,6 +91,7 @@ public class AdvisorComponentDefinition extends AbstractComponentDefinition {
 	}


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

+	@Override
 	public Object getSource() {
 		return this.advisorDefinition.getSource();
 	}
@@ -59,6 +59,7 @@ 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());
@@ -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.
@@ -79,28 +79,6 @@ 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));
@@ -37,6 +37,7 @@ 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);
@@ -95,6 +95,7 @@ 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));
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 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.
@@ -57,6 +57,7 @@ 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");
@@ -78,14 +79,17 @@ 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;
 	}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 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.
@@ -46,6 +46,7 @@ public class PointcutComponentDefinition extends AbstractComponentDefinition {
 	}


+	@Override
 	public String getName() {
 		return this.pointcutBeanName;
 	}
@@ -60,6 +61,7 @@ public class PointcutComponentDefinition extends AbstractComponentDefinition {
 		return new BeanDefinition[] {this.pointcutDefinition};
 	}

+	@Override
 	public Object getSource() {
 		return this.pointcutDefinition.getSource();
 	}
@@ -39,6 +39,7 @@ 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) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 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.
@@ -47,6 +47,7 @@ public class SimpleBeanFactoryAwareAspectInstanceFactory implements AspectInstan
 		this.aspectBeanName = aspectBeanName;
 	}

+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 		if (!StringUtils.hasText(this.aspectBeanName)) {
@@ -59,10 +60,12 @@ 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();
@@ -72,6 +75,7 @@ public class SimpleBeanFactoryAwareAspectInstanceFactory implements AspectInstan
 		}
 	}

+	@Override
 	public int getOrder() {
 		if (this.beanFactory.isSingleton(this.aspectBeanName) &&
 				this.beanFactory.isTypeMatch(this.aspectBeanName, Ordered.class)) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 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.
@@ -50,6 +50,7 @@ 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();
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 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.
@@ -49,7 +49,7 @@ public abstract class AbstractAdvisingBeanPostProcessor extends ProxyConfig
 	 */
 	private int order = Ordered.LOWEST_PRECEDENCE;

-	private final Map<Class<?>, Boolean> eligibleBeans = new ConcurrentHashMap<Class<?>, Boolean>(64);
+	private final Map<Class, Boolean> eligibleBeans = new ConcurrentHashMap<Class, Boolean>(64);


 	/**
@@ -65,6 +65,7 @@ public abstract class AbstractAdvisingBeanPostProcessor extends ProxyConfig
 		this.beforeExistingAdvisors = beforeExistingAdvisors;
 	}

+	@Override
 	public void setBeanClassLoader(ClassLoader beanClassLoader) {
 		this.beanClassLoader = beanClassLoader;
 	}
@@ -73,25 +74,26 @@ 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.
 			return bean;
 		}
-
-		if (bean instanceof Advised) {
-			Advised advised = (Advised) bean;
-			if (!advised.isFrozen() && isEligible(AopUtils.getTargetClass(bean))) {
-				// Add our local Advisor to the existing proxy's Advisor chain...
+		if (isEligible(bean, beanName)) {
+			if (bean instanceof Advised) {
+				Advised advised = (Advised) bean;
 				if (this.beforeExistingAdvisors) {
 					advised.addAdvisor(0, this.advisor);
 				}
@@ -100,47 +102,32 @@ public abstract class AbstractAdvisingBeanPostProcessor extends ProxyConfig
 				}
 				return bean;
 			}
+			else {
+				ProxyFactory proxyFactory = new ProxyFactory(bean);
+				// Copy our properties (proxyTargetClass etc) inherited from ProxyConfig.
+				proxyFactory.copyFrom(this);
+				proxyFactory.addAdvisor(this.advisor);
+				return proxyFactory.getProxy(this.beanClassLoader);
+			}
 		}
-
-		if (isEligible(bean, beanName)) {
-			ProxyFactory proxyFactory = new ProxyFactory(bean);
-			// Copy our properties (proxyTargetClass etc) inherited from ProxyConfig.
-			proxyFactory.copyFrom(this);
-			proxyFactory.addAdvisor(this.advisor);
-			return proxyFactory.getProxy(this.beanClassLoader);
+		else {
+			// No async proxy needed.
+			return bean;
 		}
-
-		// No async proxy needed.
-		return bean;
 	}

 	/**
 	 * Check whether the given bean is eligible for advising with this
 	 * post-processor's {@link Advisor}.
-	 * <p>Delegates to {@link #isEligible(Class)} for target class checking.
+	 * <p>Implements caching of {@code canApply} results per bean target class.
 	 * Can be overridden e.g. to specifically exclude certain beans by name.
-	 * <p>Note: Only called for regular bean instances but not for existing
-	 * proxy instances which implement {@link Advised} and allow for adding
-	 * the local {@link Advisor} to the existing proxy's {@link Advisor} chain.
-	 * For the latter, {@link #isEligible(Class)} is being called directly,
-	 * with the actual target class behind the existing proxy (as determined
-	 * by {@link AopUtils#getTargetClass(Object)}).
 	 * @param bean the bean instance
 	 * @param beanName the name of the bean
-	 * @see #isEligible(Class)
-	 */
-	protected boolean isEligible(Object bean, String beanName) {
-		return isEligible(bean.getClass());
-	}
-
-	/**
-	 * Check whether the given class is eligible for advising with this
-	 * post-processor's {@link Advisor}.
-	 * <p>Implements caching of {@code canApply} results per bean target class.
-	 * @param targetClass the class to check against
+	 * @see AopUtils#getTargetClass(Object)
 	 * @see AopUtils#canApply(Advisor, Class)
 	 */
-	protected boolean isEligible(Class<?> targetClass) {
+	protected boolean isEligible(Object bean, String beanName) {
+		Class<?> targetClass = AopUtils.getTargetClass(bean);
 		Boolean eligible = this.eligibleBeans.get(targetClass);
 		if (eligible != null) {
 			return eligible;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 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.
@@ -122,6 +122,7 @@ public abstract class AbstractSingletonProxyFactoryBean extends ProxyConfig
 		this.proxyClassLoader = classLoader;
 	}

+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		if (this.proxyClassLoader == null) {
 			this.proxyClassLoader = classLoader;
@@ -129,6 +130,7 @@ public abstract class AbstractSingletonProxyFactoryBean extends ProxyConfig
 	}


+	@Override
 	public void afterPropertiesSet() {
 		if (this.target == null) {
 			throw new IllegalArgumentException("Property 'target' is required");
@@ -190,6 +192,7 @@ public abstract class AbstractSingletonProxyFactoryBean extends ProxyConfig
 	}


+	@Override
 	public Object getObject() {
 		if (this.proxy == null) {
 			throw new FactoryBeanNotInitializedException();
@@ -197,6 +200,7 @@ public abstract class AbstractSingletonProxyFactoryBean extends ProxyConfig
 		return this.proxy;
 	}

+	@Override
 	public Class<?> getObjectType() {
 		if (this.proxy != null) {
 			return this.proxy.getClass();
@@ -213,6 +217,7 @@ public abstract class AbstractSingletonProxyFactoryBean extends ProxyConfig
 		return null;
 	}

+	@Override
 	public final boolean isSingleton() {
 		return true;
 	}
@@ -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.
@@ -52,13 +52,13 @@ public interface Advised extends TargetClassAware {
 	 * Return the interfaces proxied by the AOP proxy. Will not
 	 * include the target class, which may also be proxied.
 	 */
-	Class<?>[] getProxiedInterfaces();
+	Class[] getProxiedInterfaces();

 	/**
 	 * Determine whether the given interface is proxied.
 	 * @param intf the interface to check
 	 */
-	boolean isInterfaceProxied(Class<?> intf);
+	boolean isInterfaceProxied(Class intf);


 	/**
@@ -137,10 +137,12 @@ 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;
 	}
@@ -158,18 +160,21 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 	 * @see #setTargetSource
 	 * @see #setTarget
 	 */
-	public void setTargetClass(Class<?> targetClass) {
+	public void setTargetClass(Class targetClass) {
 		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;
 	}
@@ -194,7 +199,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 	/**
 	 * Set the interfaces to be proxied.
 	 */
-	public void setInterfaces(Class<?>... interfaces) {
+	public void setInterfaces(Class[] interfaces) {
 		Assert.notNull(interfaces, "Interfaces must not be null");
 		this.interfaces.clear();
 		for (Class ifc : interfaces) {
@@ -206,7 +211,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 	 * Add a new proxied interface.
 	 * @param intf the additional interface to proxy
 	 */
-	public void addInterface(Class<?> intf) {
+	public void addInterface(Class intf) {
 		Assert.notNull(intf, "Interface must not be null");
 		if (!intf.isInterface()) {
 			throw new IllegalArgumentException("[" + intf.getName() + "] is not an interface");
@@ -224,15 +229,17 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 	 * @return {@code true} if the interface was removed; {@code false}
 	 * if the interface was not found and hence could not be removed
 	 */
-	public boolean removeInterface(Class<?> intf) {
+	public boolean removeInterface(Class intf) {
 		return this.interfaces.remove(intf);
 	}

-	public Class<?>[] getProxiedInterfaces() {
+	@Override
+	public Class[] getProxiedInterfaces() {
 		return this.interfaces.toArray(new Class[this.interfaces.size()]);
 	}

-	public boolean isInterfaceProxied(Class<?> intf) {
+	@Override
+	public boolean isInterfaceProxied(Class intf) {
 		for (Class proxyIntf : this.interfaces) {
 			if (intf.isAssignableFrom(proxyIntf)) {
 				return true;
@@ -242,15 +249,18 @@ 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);
@@ -258,6 +268,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 		addAdvisorInternal(pos, advisor);
 	}

+	@Override
 	public boolean removeAdvisor(Advisor advisor) {
 		int index = indexOf(advisor);
 		if (index == -1) {
@@ -269,6 +280,7 @@ 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.");
@@ -292,11 +304,13 @@ 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");
@@ -309,16 +323,6 @@ 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
@@ -388,6 +392,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 	}


+	@Override
 	public void addAdvice(Advice advice) throws AopConfigException {
 		int pos = this.advisors.size();
 		addAdvice(pos, advice);
@@ -396,6 +401,7 @@ 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) {
@@ -412,6 +418,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 		}
 	}

+	@Override
 	public boolean removeAdvice(Advice advice) throws AopConfigException {
 		int index = indexOf(advice);
 		if (index == -1) {
@@ -423,6 +430,7 @@ 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++) {
@@ -554,6 +562,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 	}


+	@Override
 	public String toProxyConfigString() {
 		return toString();
 	}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 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.
@@ -25,19 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.WeakHashMap;

-import org.aopalliance.aop.Advice;
-import org.aopalliance.intercept.MethodInvocation;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.aop.Advisor;
-import org.springframework.aop.AopInvocationException;
-import org.springframework.aop.PointcutAdvisor;
-import org.springframework.aop.RawTargetAccess;
-import org.springframework.aop.TargetSource;
-import org.springframework.aop.support.AopUtils;
 import org.springframework.cglib.core.CodeGenerationException;
-import org.springframework.cglib.core.SpringNamingPolicy;
 import org.springframework.cglib.proxy.Callback;
 import org.springframework.cglib.proxy.CallbackFilter;
 import org.springframework.cglib.proxy.Dispatcher;
@@ -47,6 +35,17 @@ import org.springframework.cglib.proxy.MethodInterceptor;
 import org.springframework.cglib.proxy.MethodProxy;
 import org.springframework.cglib.proxy.NoOp;
 import org.springframework.cglib.transform.impl.MemorySafeUndeclaredThrowableStrategy;
+
+import org.aopalliance.aop.Advice;
+import org.aopalliance.intercept.MethodInvocation;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.aop.Advisor;
+import org.springframework.aop.AopInvocationException;
+import org.springframework.aop.PointcutAdvisor;
+import org.springframework.aop.RawTargetAccess;
+import org.springframework.aop.TargetSource;
+import org.springframework.aop.support.AopUtils;
 import org.springframework.core.SmartClassLoader;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
@@ -147,10 +146,12 @@ 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());
@@ -182,20 +183,20 @@ final class CglibAopProxy implements AopProxy, Serializable {
 				}
 			}
 			enhancer.setSuperclass(proxySuperClass);
-			enhancer.setInterfaces(AopProxyUtils.completeProxiedInterfaces(this.advised));
-			enhancer.setNamingPolicy(SpringNamingPolicy.INSTANCE);
 			enhancer.setStrategy(new MemorySafeUndeclaredThrowableStrategy(UndeclaredThrowableException.class));
+			enhancer.setInterfaces(AopProxyUtils.completeProxiedInterfaces(this.advised));
 			enhancer.setInterceptDuringConstruction(false);

 			Callback[] callbacks = getCallbacks(rootClass);
-			Class<?>[] types = new Class<?>[callbacks.length];
+			enhancer.setCallbacks(callbacks);
+			enhancer.setCallbackFilter(new ProxyCallbackFilter(
+					this.advised.getConfigurationOnlyCopy(), this.fixedInterceptorMap, this.fixedInterceptorOffset));
+
+			Class<?>[] types = new Class[callbacks.length];
 			for (int x = 0; x < types.length; x++) {
 				types[x] = callbacks[x].getClass();
 			}
-			enhancer.setCallbackFilter(new ProxyCallbackFilter(
-					this.advised.getConfigurationOnlyCopy(), this.fixedInterceptorMap, this.fixedInterceptorOffset));
 			enhancer.setCallbackTypes(types);
-			enhancer.setCallbacks(callbacks);

 			// Generate the proxy class and create a proxy instance.
 			Object proxy;
@@ -254,14 +255,11 @@ final class CglibAopProxy implements AopProxy, Serializable {
 	 * for each one found.
 	 */
 	private void doValidateClass(Class<?> proxySuperClass) {
-		if (logger.isWarnEnabled()) {
-			Method[] methods = proxySuperClass.getMethods();
-			for (Method method : methods) {
-				if (!Object.class.equals(method.getDeclaringClass()) && !Modifier.isStatic(method.getModifiers()) &&
-						Modifier.isFinal(method.getModifiers())) {
-					logger.warn("Unable to proxy method [" + method + "] because it is final: " +
-							"All calls to this method via a proxy will NOT be routed to the target instance.");
-				}
+		Method[] methods = proxySuperClass.getMethods();
+		for (Method method : methods) {
+			if (!Object.class.equals(method.getDeclaringClass()) && Modifier.isFinal(method.getModifiers())) {
+				logger.warn("Unable to proxy method [" + method + "] because it is final: " +
+						"All calls to this method via a proxy will be routed directly to the proxy.");
 			}
 		}
 	}
@@ -313,7 +311,8 @@ final class CglibAopProxy implements AopProxy, Serializable {
 			Callback[] fixedCallbacks = new Callback[methods.length];
 			this.fixedInterceptorMap = new HashMap<String, Integer>(methods.length);

-			// TODO: small memory optimisation here (can skip creation for methods with no advice)
+			// TODO: small memory optimisation here (can skip creation for
+			// methods with no advice)
 			for (int x = 0; x < methods.length; x++) {
 				List<Object> chain = this.advised.getInterceptorsAndDynamicInterceptionAdvice(methods[x], rootClass);
 				fixedCallbacks[x] = new FixedChainStaticTargetInterceptor(
@@ -340,15 +339,16 @@ final class CglibAopProxy implements AopProxy, Serializable {
 	 */
 	private static Object processReturnType(Object proxy, Object target, Method method, Object retVal) {
 		// Massage return value if necessary
-		if (retVal != null && retVal == target && !RawTargetAccess.class.isAssignableFrom(method.getDeclaringClass())) {
-			// Special case: it returned "this". Note that we can't help
-			// if the target sets a reference to itself in another returned object.
+		if (retVal != null && retVal == target &&
+				!RawTargetAccess.class.isAssignableFrom(method.getDeclaringClass())) {
+			// Special case: it returned "this".
+			// Note that we can't help if the target sets a reference
+			// to itself in another returned object.
 			retVal = proxy;
 		}
 		Class<?> returnType = method.getReturnType();
 		if (retVal == null && returnType != Void.TYPE && returnType.isPrimitive()) {
-			throw new AopInvocationException(
-					"Null return value from advice does not match primitive return type for: " + method);
+				throw new AopInvocationException("Null return value from advice does not match primitive return type for: " + method);
 		}
 		return retVal;
 	}
@@ -388,6 +388,7 @@ 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);
@@ -407,6 +408,7 @@ 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 {
@@ -434,6 +436,7 @@ 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 {
@@ -458,6 +461,7 @@ 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();
@@ -487,6 +491,7 @@ final class CglibAopProxy implements AopProxy, Serializable {
 			this.target = target;
 		}

+		@Override
 		public Object loadObject() {
 			return this.target;
 		}
@@ -504,6 +509,7 @@ final class CglibAopProxy implements AopProxy, Serializable {
 			this.advised = advised;
 		}

+		@Override
 		public Object loadObject() throws Exception {
 			return this.advised;
 		}
@@ -522,6 +528,7 @@ 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) {
@@ -554,6 +561,7 @@ 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();
 		}
@@ -577,6 +585,7 @@ 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);
@@ -594,12 +603,13 @@ final class CglibAopProxy implements AopProxy, Serializable {
 	 */
 	private static class DynamicAdvisedInterceptor implements MethodInterceptor, Serializable {

-		private final AdvisedSupport advised;
+		private AdvisedSupport advised;

 		public DynamicAdvisedInterceptor(AdvisedSupport advised) {
 			this.advised = advised;
 		}

+		@Override
 		public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {
 			Object oldProxy = null;
 			boolean setProxyContext = false;
@@ -611,8 +621,8 @@ final class CglibAopProxy implements AopProxy, Serializable {
 					oldProxy = AopContext.setCurrentProxy(proxy);
 					setProxyContext = true;
 				}
-				// May be null. Get as late as possible to minimize the time we
-				// "own" the target, in case it comes from a pool...
+				// May be null Get as late as possible to minimize the time we
+				// "own" the target, in case it comes from a pool.
 				target = getTarget();
 				if (target != null) {
 					targetClass = target.getClass();
@@ -756,6 +766,7 @@ 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");
@@ -817,8 +828,8 @@ final class CglibAopProxy implements AopProxy, Serializable {
 				// of the target type. If so we know it never needs to have return type
 				// massage and can use a dispatcher.
 				// If the proxy is being exposed, then must use the interceptor the
-				// correct one is already configured. If the target is not static, then
-				// cannot use a dispatcher because the target cannot be released.
+				// correct one is already configured. If the target is not static cannot
+				// use a Dispatcher because the target can not then be released.
 				if (exposeProxy || !isStatic) {
 					return INVOKE_TARGET;
 				}
@@ -850,7 +861,7 @@ final class CglibAopProxy implements AopProxy, Serializable {

 		@Override
 		public boolean equals(Object other) {
-			if (this == other) {
+			if (other == this) {
 				return true;
 			}
 			if (!(other instanceof ProxyCallbackFilter)) {
@@ -46,6 +46,7 @@ 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) {

@@ -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.
@@ -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();
@@ -106,10 +106,12 @@ 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());
@@ -147,6 +149,7 @@ 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;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 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.
@@ -19,6 +19,7 @@ package org.springframework.aop.framework;
 import org.aopalliance.intercept.Interceptor;

 import org.springframework.aop.TargetSource;
+import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;

 /**
@@ -46,8 +47,9 @@ public class ProxyFactory extends ProxyCreatorSupport {
 	 * @param target the target object to be proxied
 	 */
 	public ProxyFactory(Object target) {
-		setTarget(target);
+		Assert.notNull(target, "Target object must not be null");
 		setInterfaces(ClassUtils.getAllInterfaces(target));
+		setTarget(target);
 	}

 	/**
@@ -55,7 +57,7 @@ public class ProxyFactory extends ProxyCreatorSupport {
 	 * <p>No target, only interfaces. Must add interceptors.
 	 * @param proxyInterfaces the interfaces that the proxy should implement
 	 */
-	public ProxyFactory(Class<?>... proxyInterfaces) {
+	public ProxyFactory(Class[] proxyInterfaces) {
 		setInterfaces(proxyInterfaces);
 	}

@@ -67,7 +69,7 @@ public class ProxyFactory extends ProxyCreatorSupport {
 	 * @param proxyInterface the interface that the proxy should implement
 	 * @param interceptor the interceptor that the proxy should invoke
 	 */
-	public ProxyFactory(Class<?> proxyInterface, Interceptor interceptor) {
+	public ProxyFactory(Class proxyInterface, Interceptor interceptor) {
 		addInterface(proxyInterface);
 		addAdvice(interceptor);
 	}
@@ -78,7 +80,7 @@ public class ProxyFactory extends ProxyCreatorSupport {
 	 * @param proxyInterface the interface that the proxy should implement
 	 * @param targetSource the TargetSource that the proxy should invoke
 	 */
-	public ProxyFactory(Class<?> proxyInterface, TargetSource targetSource) {
+	public ProxyFactory(Class proxyInterface, TargetSource targetSource) {
 		addInterface(proxyInterface);
 		setTargetSource(targetSource);
 	}
@@ -218,12 +218,14 @@ 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();
@@ -237,6 +239,7 @@ 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()) {
@@ -257,6 +260,7 @@ 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) {
@@ -278,6 +282,7 @@ public class ProxyFactoryBean extends ProxyCreatorSupport
 		}
 	}

+	@Override
 	public boolean isSingleton() {
 		return this.singleton;
 	}
@@ -638,10 +643,12 @@ 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);
 		}
@@ -114,14 +114,17 @@ 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;
 	}
@@ -131,19 +134,23 @@ 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) {
@@ -192,6 +199,7 @@ 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) {
@@ -210,6 +218,7 @@ 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.
@@ -230,6 +239,7 @@ public class ReflectiveMethodInvocation implements ProxyMethodInvocation, Clonea
 	}


+	@Override
 	public void setUserAttribute(String key, Object value) {
 		if (value != null) {
 			if (this.userAttributes == null) {
@@ -244,6 +254,7 @@ public class ReflectiveMethodInvocation implements ProxyMethodInvocation, Clonea
 		}
 	}

+	@Override
 	public Object getUserAttribute(String key) {
 		return (this.userAttributes != null ? this.userAttributes.get(key) : null);
 	}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 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,10 +48,12 @@ 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);
@@ -34,10 +34,12 @@ 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);
@@ -47,6 +47,7 @@ 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());
@@ -53,6 +53,7 @@ public class DefaultAdvisorAdapterRegistry implements AdvisorAdapterRegistry, Se
 	}


+	@Override
 	public Advisor wrap(Object adviceObject) throws UnknownAdviceTypeException {
 		if (adviceObject instanceof Advisor) {
 			return (Advisor) adviceObject;
@@ -74,6 +75,7 @@ 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();
@@ -91,6 +93,7 @@ public class DefaultAdvisorAdapterRegistry implements AdvisorAdapterRegistry, Se
 		return interceptors.toArray(new MethodInterceptor[interceptors.size()]);
 	}

+	@Override
 	public void registerAdvisorAdapter(AdvisorAdapter adapter) {
 		this.adapters.add(adapter);
 	}
@@ -34,10 +34,12 @@ 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);
@@ -46,6 +46,7 @@ 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();
@@ -34,10 +34,12 @@ 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());
 	}
@@ -119,6 +119,7 @@ public class ThrowsAdviceInterceptor implements MethodInterceptor, AfterAdvice {
 		return handler;
 	}

+	@Override
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		try {
 			return mi.proceed();
@@ -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.
@@ -20,8 +20,10 @@ 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;
@@ -136,11 +138,11 @@ public abstract class AbstractAutoProxyCreator extends ProxyConfig

 	private final Map<Object, Boolean> advisedBeans = new ConcurrentHashMap<Object, Boolean>(64);

-	// using a ConcurrentHashMap as a Set
-	private final Map<String, Boolean> targetSourcedBeans = new ConcurrentHashMap<String, Boolean>(16);
+	private final Set<String> targetSourcedBeans =
+			Collections.newSetFromMap(new ConcurrentHashMap<String, Boolean>(16));

-	// using a ConcurrentHashMap as a Set
-	private final Map<Object, Boolean> earlyProxyReferences = new ConcurrentHashMap<Object, Boolean>(16);
+	private final Set<Object> earlyProxyReferences =
+			Collections.newSetFromMap(new ConcurrentHashMap<Object, Boolean>(16));

 	private final Map<Object, Class<?>> proxyTypes = new ConcurrentHashMap<Object, Class<?>>(16);

@@ -155,6 +157,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyConfig
 		this.order = order;
 	}

+	@Override
 	public final int getOrder() {
 		return this.order;
 	}
@@ -232,12 +235,14 @@ 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;
 	}
@@ -251,25 +256,29 @@ 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.put(cacheKey, Boolean.TRUE);
+		this.earlyProxyReferences.add(cacheKey);
 		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.containsKey(beanName)) {
+		if (beanName == null || !this.targetSourcedBeans.contains(beanName)) {
 			if (this.advisedBeans.containsKey(cacheKey)) {
 				return null;
 			}
@@ -285,7 +294,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyConfig
 		if (beanName != null) {
 			TargetSource targetSource = getCustomTargetSource(beanClass, beanName);
 			if (targetSource != null) {
-				this.targetSourcedBeans.put(beanName, Boolean.TRUE);
+				this.targetSourcedBeans.add(beanName);
 				Object[] specificInterceptors = getAdvicesAndAdvisorsForBean(beanClass, beanName, targetSource);
 				Object proxy = createProxy(beanClass, beanName, specificInterceptors, targetSource);
 				this.proxyTypes.put(cacheKey, proxy.getClass());
@@ -296,16 +305,19 @@ 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;
 	}
@@ -315,10 +327,11 @@ 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.containsKey(cacheKey)) {
+			if (!this.earlyProxyReferences.contains(cacheKey)) {
 				return wrapIfNecessary(bean, beanName, cacheKey);
 			}
 		}
@@ -344,7 +357,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.containsKey(beanName)) {
+		if (beanName != null && this.targetSourcedBeans.contains(beanName)) {
 			return bean;
 		}
 		if (Boolean.FALSE.equals(this.advisedBeans.get(cacheKey))) {
@@ -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.
@@ -81,32 +81,24 @@ public class BeanFactoryAdvisorRetrievalHelper {

 		List<Advisor> advisors = new LinkedList<Advisor>();
 		for (String name : advisorNames) {
-			if (isEligibleBean(name)) {
-				if (this.beanFactory.isCurrentlyInCreation(name)) {
-					if (logger.isDebugEnabled()) {
-						logger.debug("Skipping currently created advisor '" + name + "'");
-					}
+			if (isEligibleBean(name) && !this.beanFactory.isCurrentlyInCreation(name)) {
+				try {
+					advisors.add(this.beanFactory.getBean(name, Advisor.class));
 				}
-				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;
+				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;
 						}
-						throw ex;
 					}
+					throw ex;
 				}
 			}
 		}
@@ -79,6 +79,7 @@ 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) {
@@ -66,6 +66,7 @@ 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 " +
@@ -86,6 +87,7 @@ public abstract class AbstractBeanFactoryBasedTargetSourceCreator
 	// Implementation of the TargetSourceCreator interface
 	//---------------------------------------------------------------------

+	@Override
 	public final TargetSource getTargetSource(Class<?> beanClass, String beanName) {
 		AbstractBeanFactoryBasedTargetSource targetSource =
 				createBeanFactoryBasedTargetSource(beanClass, beanName);
@@ -159,6 +161,7 @@ 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()) {
@@ -105,6 +105,7 @@ 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)) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 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.
@@ -21,6 +21,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executor;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 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.
@@ -62,11 +62,11 @@ public class AsyncExecutionInterceptor extends AsyncExecutionAspectSupport

 	/**
 	 * Create a new {@code AsyncExecutionInterceptor}.
-	 * @param defaultExecutor the {@link Executor} (typically a Spring {@link AsyncTaskExecutor}
-	 * or {@link java.util.concurrent.ExecutorService}) to delegate to
+	 * @param executor the {@link Executor} (typically a Spring {@link AsyncTaskExecutor}
+	 * or {@link java.util.concurrent.ExecutorService}) to delegate to.
 	 */
-	public AsyncExecutionInterceptor(Executor defaultExecutor) {
-		super(defaultExecutor);
+	public AsyncExecutionInterceptor(Executor executor) {
+		super(executor);
 	}


@@ -77,6 +77,7 @@ 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);
@@ -90,6 +91,7 @@ public class AsyncExecutionInterceptor extends AsyncExecutionAspectSupport

 		Future<?> result = executor.submit(
 				new Callable<Object>() {
+					@Override
 					public Object call() throws Exception {
 						try {
 							Object result = invocation.proceed();
@@ -117,14 +119,15 @@ public class AsyncExecutionInterceptor extends AsyncExecutionAspectSupport
 	 * Subclasses may override to provide support for extracting qualifier information,
 	 * e.g. via an annotation on the given method.
 	 * @return always {@code null}
-	 * @since 3.1.2
 	 * @see #determineAsyncExecutor(Method)
+	 * @since 3.1.2
 	 */
 	@Override
 	protected String getExecutorQualifier(Method method) {
 		return null;
 	}

+	@Override
 	public int getOrder() {
 		return Ordered.HIGHEST_PRECEDENCE;
 	}
@@ -47,6 +47,7 @@ public class ConcurrencyThrottleInterceptor extends ConcurrencyThrottleSupport
 		setConcurrencyLimit(1);
 	}

+	@Override
 	public Object invoke(MethodInvocation methodInvocation) throws Throwable {
 		beforeAccess();
 		try {
@@ -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.
@@ -325,18 +325,19 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
 		while (matcher.find()) {
 			String match = matcher.group();
 			if (PLACEHOLDER_METHOD_NAME.equals(match)) {
-				matcher.appendReplacement(output, escape(methodInvocation.getMethod().getName()));
+				matcher.appendReplacement(output, Matcher.quoteReplacement(methodInvocation.getMethod().getName()));
 			}
 			else if (PLACEHOLDER_TARGET_CLASS_NAME.equals(match)) {
 				String className = getClassForLogging(methodInvocation.getThis()).getName();
-				matcher.appendReplacement(output, escape(className));
+				matcher.appendReplacement(output, Matcher.quoteReplacement(className));
 			}
 			else if (PLACEHOLDER_TARGET_CLASS_SHORT_NAME.equals(match)) {
 				String shortName = ClassUtils.getShortName(getClassForLogging(methodInvocation.getThis()));
-				matcher.appendReplacement(output, escape(shortName));
+				matcher.appendReplacement(output, Matcher.quoteReplacement(shortName));
 			}
 			else if (PLACEHOLDER_ARGUMENTS.equals(match)) {
-				matcher.appendReplacement(output, escape(StringUtils.arrayToCommaDelimitedString(methodInvocation.getArguments())));
+				matcher.appendReplacement(output,
+						Matcher.quoteReplacement(StringUtils.arrayToCommaDelimitedString(methodInvocation.getArguments())));
 			}
 			else if (PLACEHOLDER_ARGUMENT_TYPES.equals(match)) {
 				appendArgumentTypes(methodInvocation, matcher, output);
@@ -345,7 +346,7 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
 				appendReturnValue(methodInvocation, matcher, output, returnValue);
 			}
 			else if (throwable != null && PLACEHOLDER_EXCEPTION.equals(match)) {
-				matcher.appendReplacement(output, escape(throwable.toString()));
+				matcher.appendReplacement(output, Matcher.quoteReplacement(throwable.toString()));
 			}
 			else if (PLACEHOLDER_INVOCATION_TIME.equals(match)) {
 				matcher.appendReplacement(output, Long.toString(invocationTime));
@@ -379,7 +380,7 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
 			matcher.appendReplacement(output, "null");
 		}
 		else {
-			matcher.appendReplacement(output, escape(returnValue.toString()));
+			matcher.appendReplacement(output, Matcher.quoteReplacement(returnValue.toString()));
 		}
 	}

@@ -399,7 +400,8 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
 		for (int i = 0; i < argumentTypeShortNames.length; i++) {
 			argumentTypeShortNames[i] = ClassUtils.getShortName(argumentTypes[i]);
 		}
-		matcher.appendReplacement(output, escape(StringUtils.arrayToCommaDelimitedString(argumentTypeShortNames)));
+		matcher.appendReplacement(output,
+				Matcher.quoteReplacement(StringUtils.arrayToCommaDelimitedString(argumentTypeShortNames)));
 	}

 	/**
@@ -417,27 +419,4 @@ 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();
-	}
-
 }
@@ -109,6 +109,7 @@ 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);
@@ -142,6 +143,7 @@ public abstract class ExposeBeanNameAdvisors {
 			return super.invoke(mi);
 		}

+		@Override
 		public String getBeanName() {
 			return this.beanName;
 		}
@@ -84,6 +84,7 @@ public class ExposeInvocationInterceptor implements MethodInterceptor, Ordered,
 	private ExposeInvocationInterceptor() {
 	}

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

+	@Override
 	public int getOrder() {
 		return Ordered.HIGHEST_PRECEDENCE + 1;
 	}
@@ -55,10 +55,12 @@ 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);
 	}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 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.
@@ -78,6 +78,7 @@ 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);
@@ -90,7 +91,7 @@ public class ScopedProxyFactoryBean extends ProxyConfig implements FactoryBean<O
 		pf.copyFrom(this);
 		pf.setTargetSource(this.scopedTargetSource);

-		Class<?> beanType = beanFactory.getType(this.targetBeanName);
+		Class beanType = beanFactory.getType(this.targetBeanName);
 		if (beanType == null) {
 			throw new IllegalStateException("Cannot create scoped proxy for bean '" + this.targetBeanName +
 					"': Target type could not be determined at the time of proxy creation.");
@@ -111,6 +112,7 @@ public class ScopedProxyFactoryBean extends ProxyConfig implements FactoryBean<O
 	}


+	@Override
 	public Object getObject() {
 		if (this.proxy == null) {
 			throw new FactoryBeanNotInitializedException();
@@ -118,13 +120,18 @@ public class ScopedProxyFactoryBean extends ProxyConfig implements FactoryBean<O
 		return this.proxy;
 	}

+	@Override
 	public Class<?> getObjectType() {
 		if (this.proxy != null) {
 			return this.proxy.getClass();
 		}
-		return this.scopedTargetSource.getTargetClass();
+		if (this.scopedTargetSource != null) {
+			return this.scopedTargetSource.getTargetClass();
+		}
+		return null;
 	}

+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
@@ -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.
@@ -38,7 +38,7 @@ public abstract class ScopedProxyUtils {


 	/**
-	 * Generate a scoped proxy for the supplied target bean, registering the target
+	 * Generates a scoped proxy for the supplied target bean, registering the target
 	 * bean with an internal name and setting 'targetBeanName' on the scoped proxy.
 	 * @param definition the original bean definition
 	 * @param registry the bean definition registry
@@ -50,20 +50,20 @@ public abstract class ScopedProxyUtils {

 		String originalBeanName = definition.getBeanName();
 		BeanDefinition targetDefinition = definition.getBeanDefinition();
-		String targetBeanName = getTargetBeanName(originalBeanName);

 		// 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.setDecoratedDefinition(new BeanDefinitionHolder(targetDefinition, targetBeanName));
-		proxyDefinition.setOriginatingBeanDefinition(targetDefinition);
+		proxyDefinition.setOriginatingBeanDefinition(definition.getBeanDefinition());
 		proxyDefinition.setSource(definition.getSource());
 		proxyDefinition.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);

+		String targetBeanName = getTargetBeanName(originalBeanName);
 		proxyDefinition.getPropertyValues().add("targetBeanName", targetBeanName);
+
 		if (proxyTargetClass) {
 			targetDefinition.setAttribute(AutoProxyUtils.PRESERVE_TARGET_CLASS_ATTRIBUTE, Boolean.TRUE);
-			// ScopedProxyFactoryBean's "proxyTargetClass" default is TRUE, so we don't need to set it explicitly here.
+			// ScopedFactoryBean's "proxyTargetClass" default is TRUE, so we don't need to set it explicitly here.
 		}
 		else {
 			proxyDefinition.getPropertyValues().add("proxyTargetClass", Boolean.FALSE);
@@ -69,6 +69,7 @@ public abstract class AbstractBeanFactoryPointcutAdvisor extends AbstractPointcu
 		return this.adviceBeanName;
 	}

+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
@@ -79,6 +80,7 @@ public abstract class AbstractBeanFactoryPointcutAdvisor extends AbstractPointcu
 		}
 	}

+	@Override
 	public Advice getAdvice() {
 		synchronized (this.adviceMonitor) {
 			if (this.advice == null && this.adviceBeanName != null) {
@@ -83,6 +83,7 @@ public abstract class AbstractExpressionPointcut implements ExpressionPointcut,
 	/**
 	 * Return this pointcut's expression.
 	 */
+	@Override
 	public String getExpression() {
 		return this.expression;
 	}
@@ -39,6 +39,7 @@ public abstract class AbstractGenericPointcutAdvisor extends AbstractPointcutAdv
 		this.advice = advice;
 	}

+	@Override
 	public Advice getAdvice() {
 		return this.advice;
 	}
@@ -44,6 +44,7 @@ public abstract class AbstractPointcutAdvisor implements PointcutAdvisor, Ordere
 		this.order = order;
 	}

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

+	@Override
 	public boolean isPerInstance() {
 		return true;
 	}
@@ -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.
@@ -29,16 +29,17 @@ import org.springframework.util.StringUtils;
 * <ul>
 * <li>pattern: regular expression for the fully-qualified method names to match.
 * The exact regexp syntax will depend on the subclass (e.g. Perl5 regular expressions)
- * <li>patterns: alternative property taking a String array of patterns.
- * The result will be the union of these patterns.
+ * <li>patterns: alternative property taking a String array of patterns. The result will
+ * be the union of these patterns.
 * </ul>
 *
 * <p>Note: the regular expressions must be a match. For example,
 * {@code .*get.*} will match com.mycom.Foo.getBar().
 * {@code get.*} will not.
 *
- * <p>This base class is serializable. Subclasses should declare all fields transient;
- * the {@link #initPatternRepresentation} method will be invoked again on deserialization.
+ * <p>This base class is serializable. Subclasses should declare all fields transient
+ * - the initPatternRepresentation method in this class will be invoked again on the
+ * client side on deserialization.
 *
 * @author Rod Johnson
 * @author Juergen Hoeller
@@ -50,14 +51,10 @@ import org.springframework.util.StringUtils;
 public abstract class AbstractRegexpMethodPointcut extends StaticMethodMatcherPointcut
 		implements Serializable {

-	/**
-	 * Regular expressions to match.
-	 */
+	/** Regular expressions to match */
 	private String[] patterns = new String[0];

-	/**
-	 * Regular expressions <strong>not</strong> to match.
-	 */
+	/** Regular expressions <strong>not</strong> to match */
 	private String[] excludedPatterns = new String[0];


@@ -67,15 +64,15 @@ public abstract class AbstractRegexpMethodPointcut extends StaticMethodMatcherPo
 	 * @see #setPatterns
 	 */
 	public void setPattern(String pattern) {
-		setPatterns(pattern);
+		setPatterns(new String[] {pattern});
 	}

 	/**
 	 * Set the regular expressions defining methods to match.
-	 * Matching will be the union of all these; if any match, the pointcut matches.
-	 * @see #setPattern
+	 * Matching will be the union of all these; if any match,
+	 * the pointcut matches.
 	 */
-	public void setPatterns(String... patterns) {
+	public void setPatterns(String[] patterns) {
 		Assert.notEmpty(patterns, "'patterns' must not be empty");
 		this.patterns = new String[patterns.length];
 		for (int i = 0; i < patterns.length; i++) {
@@ -97,15 +94,15 @@ public abstract class AbstractRegexpMethodPointcut extends StaticMethodMatcherPo
 	 * @see #setExcludedPatterns
 	 */
 	public void setExcludedPattern(String excludedPattern) {
-		setExcludedPatterns(excludedPattern);
+		setExcludedPatterns(new String[] {excludedPattern});
 	}

 	/**
 	 * Set the regular expressions defining methods to match for exclusion.
-	 * Matching will be the union of all these; if any match, the pointcut matches.
-	 * @see #setExcludedPattern
+	 * Matching will be the union of all these; if any match,
+	 * the pointcut matches.
 	 */
-	public void setExcludedPatterns(String... excludedPatterns) {
+	public void setExcludedPatterns(String[] excludedPatterns) {
 		Assert.notEmpty(excludedPatterns, "'excludedPatterns' must not be empty");
 		this.excludedPatterns = new String[excludedPatterns.length];
 		for (int i = 0; i < excludedPatterns.length; i++) {
@@ -127,7 +124,8 @@ 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.
 	 */
-	public boolean matches(Method method, Class<?> targetClass) {
+	@Override
+	public boolean matches(Method method, Class targetClass) {
 		return ((targetClass != null && matchesPattern(targetClass.getName() + "." + method.getName())) ||
 				matchesPattern(method.getDeclaringClass().getName() + "." + method.getName()));
 	}
@@ -175,18 +173,18 @@ public abstract class AbstractRegexpMethodPointcut extends StaticMethodMatcherPo
 	protected abstract void initExcludedPatternRepresentation(String[] patterns) throws IllegalArgumentException;

 	/**
-	 * Does the pattern at the given index match the given String?
-	 * @param pattern the {@code String} pattern to match
-	 * @param patternIndex index of pattern (starting from 0)
-	 * @return {@code true} if there is a match, {@code false} otherwise
+	 * Does the pattern at the given index match this string?
+	 * @param pattern {@code String} pattern to match
+	 * @param patternIndex index of pattern from 0
+	 * @return {@code true} if there is a match, else {@code false}.
 	 */
 	protected abstract boolean matches(String pattern, int patternIndex);

 	/**
-	 * Does the exclusion pattern at the given index match the given String?
-	 * @param pattern the {@code String} pattern to match
-	 * @param patternIndex index of pattern (starting from 0)
-	 * @return {@code true} if there is a match, {@code false} otherwise
+	 * Does the exclusion pattern at the given index match this string?
+	 * @param pattern {@code String} pattern to match.
+	 * @param patternIndex index of pattern starting from 0.
+	 * @return {@code true} if there is a match, else {@code false}.
 	 */
 	protected abstract boolean matchesExclusion(String pattern, int patternIndex);

@@ -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.
@@ -23,7 +23,8 @@ import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;

 /**
- * Static utility methods for composing {@link ClassFilter ClassFilters}.
+ * Static utility methods for composing
+ * {@link org.springframework.aop.ClassFilter ClassFilters}.
 *
 * @author Rod Johnson
 * @author Rob Harrop
@@ -95,9 +96,10 @@ public abstract class ClassFilters {
 			this.filters = filters;
 		}

-		public boolean matches(Class<?> clazz) {
-			for (ClassFilter filter : this.filters) {
-				if (filter.matches(clazz)) {
+		@Override
+		public boolean matches(Class clazz) {
+			for (int i = 0; i < this.filters.length; i++) {
+				if (this.filters[i].matches(clazz)) {
 					return true;
 				}
 			}
@@ -129,9 +131,10 @@ public abstract class ClassFilters {
 			this.filters = filters;
 		}

-		public boolean matches(Class<?> clazz) {
-			for (ClassFilter filter : this.filters) {
-				if (!filter.matches(clazz)) {
+		@Override
+		public boolean matches(Class clazz) {
+			for (int i = 0; i < this.filters.length; i++) {
+				if (!this.filters[i].matches(clazz)) {
 					return false;
 				}
 			}
@@ -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.
@@ -170,14 +170,17 @@ public class ComposablePointcut implements Pointcut, Serializable {
 	}


+	@Override
 	public ClassFilter getClassFilter() {
 		return this.classFilter;
 	}

+	@Override
 	public MethodMatcher getMethodMatcher() {
 		return this.methodMatcher;
 	}

+
 	@Override
 	public boolean equals(Object other) {
 		if (this == other) {
@@ -186,6 +189,7 @@ public class ComposablePointcut implements Pointcut, Serializable {
 		if (!(other instanceof ComposablePointcut)) {
 			return false;
 		}
+
 		ComposablePointcut that = (ComposablePointcut) other;
 		return ObjectUtils.nullSafeEquals(that.classFilter, this.classFilter) &&
 				ObjectUtils.nullSafeEquals(that.methodMatcher, this.methodMatcher);
@@ -205,7 +209,8 @@ public class ComposablePointcut implements Pointcut, Serializable {

 	@Override
 	public String toString() {
-		return "ComposablePointcut: " + this.classFilter + ", " +this.methodMatcher;
+		return "ComposablePointcut: ClassFilter [" + this.classFilter +
+				"], MethodMatcher [" + this.methodMatcher + "]";
 	}

 }
@@ -71,6 +71,7 @@ public class ControlFlowPointcut implements Pointcut, ClassFilter, MethodMatcher
 	/**
 	 * Subclasses can override this for greater filtering (and performance).
 	 */
+	@Override
 	public boolean matches(Class clazz) {
 		return true;
 	}
@@ -79,14 +80,17 @@ 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();
@@ -101,10 +105,12 @@ public class ControlFlowPointcut implements Pointcut, ClassFilter, MethodMatcher
 	}


+	@Override
 	public ClassFilter getClassFilter() {
 		return this;
 	}

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

+	@Override
 	public Pointcut getPointcut() {
 		return this.pointcut;
 	}
@@ -102,10 +102,12 @@ 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 &&
@@ -121,23 +123,28 @@ 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;
 	}
@@ -77,6 +77,7 @@ public class DefaultPointcutAdvisor extends AbstractGenericPointcutAdvisor imple
 		this.pointcut = (pointcut != null ? pointcut : Pointcut.TRUE);
 	}

+	@Override
 	public Pointcut getPointcut() {
 		return this.pointcut;
 	}
--- a/Show More
+++ b/Show More