Manual URL Cleanup

See gh-22517

.mailmap

@@ -1,23 +0,0 @@
-Juergen Hoeller <jhoeller@pivotal.io> jhoeller <jhoeller@vmware.com>
-<jhoeller@pivotal.io> <jhoeller@vmware.com>
-<jhoeller@pivotal.io> <jhoeller@gopivotal.com>
-<rstoyanchev@pivotal.io> <rstoyanchev@vmware.com>
-<rstoyanchev@pivotal.io> <rstoyanchev@gopivotal.com>
-<pwebb@pivotal.io> <pwebb@vmware.com>
-<pwebb@pivotal.io> <pwebb@gopivotal.com>
-<cbeams@pivotal.io> <cbeams@vmware.com>
-<cbeams@pivotal.io> <cbeams@gopivotal.com>
-<cbeams@pivotal.io> <cbeams@gmail.com>
-<apoutsma@pivotal.io> <apoutsma@vmware.com>
-<apoutsma@pivotal.io> <apoutsma@gopivotal.com>
-<apoutsma@pivotal.io> <poutsma@mac.com>
-<ogierke@pivotal.io> <ogierke@vmware.com>
-<ogierke@pivotal.io> <ogierke@gopivotal.com>
-<dsyer@pivotal.io> <dsyer@vmware.com>
-<dsyer@pivotal.io> <dsyer@gopivotal.com>
-<dsyer@pivotal.io> <david_syer@hotmail.com>
-<aclement@pivotal.io> <aclement@vmware.com>
-<aclement@pivotal.io> <aclement@gopivotal.com>
-<aclement@pivotal.io> <andrew.clement@gmail.com>
-<dmitry.katsubo@gmail.com> <dmitry.katsubo@gmai.com>
-Nick Williams <nicholas@nicholaswilliams.net> Nicholas Williams <nicholas@nicholaswilliams.net>

CONTRIBUTING.md

@@ -22,18 +22,10 @@ do not find something similar, please create a new JIRA issue before submitting
 a pull request unless the change is truly trivial -- for example: typo fixes,
 removing compiler warnings, etc.
 
-### Discuss non-trivial contribution ideas with committers
-
-If you're considering anything more than correcting a typo or fixing a minor
-bug, please discuss it on the [spring-framework-contrib][] mailing list before
-submitting a pull request. We're happy to provide guidance, but please spend an
-hour or two researching the subject on your own, including searching the mailing
-list for prior discussions.
-
-### Sign the Individual Contributor License Agreement (ICLA)
+### Sign the Contributor License Agreement
 
 If you have not previously done so, please fill out and submit the
-[Spring ICLA form][]. You'll receive a token when this process is complete.
+[SpringSource CLA form][]. You'll receive a token when this process is complete.
 Keep track of this; you may be asked for it later!
 
 Note that emailing/postal mailing a signed copy is _not_ necessary. Submission
@@ -42,8 +34,8 @@ of the web form is all that is required.
 Once you've completed the web form, simply add the following in a comment on
 your pull request:
 
-    I have signed and agree to the terms of the Spring Individual Contributor
-    License Agreement.
+    I have signed and agree to the terms of the SpringSource Individual
+    Contributor License Agreement.
 
 You do not need to include your token/id. Please add the above statement to all
 future pull requests as well, simply so that the Spring Framework team knows
@@ -93,7 +85,7 @@ present in the framework.
 
 ```java
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -114,18 +106,16 @@ package ...;
 ### Update Apache license header in modified files as necessary
 
 Always check the date range in the license header. For example, if you've
-modified a file in 2015 whose header still reads:
+modified a file in 2014 whose header still reads:
 
 ```java
-/*
  * Copyright 2002-2011 the original author or authors.
 ```
 
-Then be sure to update it to 2015 accordingly:
+Then be sure to update it to 2014 accordingly:
 
 ```java
-/*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
 ```
 
 ### Use @since tags for newly-added public API types and methods
@@ -137,7 +127,7 @@ For example:
  * ...
  *
  * @author First Last
- * @since 4.2.3
+ * @since 4.0
  * @see ...
  */
 ```
@@ -189,11 +179,11 @@ intend to submit as pull requests. For example, this is not acceptable:
     Author: Nickname <user@mail.com>
 
 Rather, please include your first and last name, properly capitalized, as
-submitted against the Spring Individual Contributor License Agreement (ICLA):
+submitted against the SpringSource contributor license agreement:
 
     Author: First Last <user@mail.com>
 
-This helps ensure traceability against the ICLA and also goes a long way to
+This helps ensure traceability against the CLA and also goes a long way to
 ensuring useful output from tools like `git shortlog` and others.
 
 You can configure this via the account admin area in GitHub (useful for
@@ -236,16 +226,16 @@ Most importantly, please format your commit messages in the following way
     Issue: SPR-1234, SPR-1235
 
 
-1. Use imperative statements in the subject line, e.g. "Fix broken Javadoc link".
+1. Use imperative statements in the subject line, e.g. "Fix broken Javadoc link"
 1. Begin the subject line with a capitalized verb, e.g. "Add, Prune, Fix,
     Introduce, Avoid, etc."
-1. Do not end the subject line with a period.
-1. Restrict the subject line to 50 characters or less if possible.
-1. Wrap lines in the body at 72 characters or less.
+1. Do not end the subject line with a period
+1. Restrict the subject line to 50 characters or less if possible
+1. Wrap lines in the body at 72 characters or less
 1. Mention associated JIRA issue(s) at the end of the commit comment, prefixed
-    with "Issue: " as above.
+    with "Issue: " as above
 1. In the body of the commit message, explain how things worked before this
-    commit, what has changed, and how things work now.
+    commit, what has changed, and how things work now
 
 For examples of this style, issue a `git log --author=cbeams` in the
 `spring-framework` git repository. For convenience, here are several such commits:
@@ -276,9 +266,9 @@ In the body:
     mechanisms in the framework insufficient? Make a case that this is a
     general-purpose problem and that yours is a general-purpose solution, etc.
 1. Add any additional information and ask questions; start a conversation or
-    continue one from JIRA.
-1. Mention the JIRA issue ID.
-1. Also mention that you have submitted the ICLA as described above.
+    continue one from JIRA
+1. Mention the JIRA issue ID
+1. Also mention that you have submitted the CLA as described above
 
 Note that for pull requests containing a single commit, GitHub will default the
 subject line and body of the pull request to match the subject line and body of
@@ -309,7 +299,7 @@ need to issue a new pull request when asked to make changes.
 [help documentation]: http://help.github.com/send-pull-requests
 [JIRA issue tracker]: https://jira.spring.io/browse/SPR
 [spring-framework-contrib]: https://groups.google.com/forum/#!forum/spring-framework-contrib
-[Spring ICLA form]: https://support.springsource.com/spring_committer_signup
+[SpringSource CLA form]: https://support.springsource.com/spring_committer_signup
 [fork-and-edit]: https://github.com/blog/844-forking-with-the-edit-button
 [Spring Framework Code Style]: https://github.com/spring-projects/spring-framework/wiki/Spring-Framework-Code-Style
 [Rewriting History section of Pro Git]: http://git-scm.com/book/en/Git-Tools-Rewriting-History

README.md

@@ -1,29 +1,30 @@
 ## Spring Framework
 The Spring Framework provides a comprehensive programming and configuration
-model for modern Java-based enterprise applications -- on any kind of deployment
+model for modern Java-based enterprise applications - on any kind of deployment
 platform. A key element of Spring is infrastructural support at the application
 level: Spring focuses on the "plumbing" of enterprise applications so that teams
 can focus on application-level business logic, without unnecessary ties to
 specific deployment environments.
 
-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 [Spring organization][] on GitHub for a full list.
+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 [Spring organization][] on GitHub for a full list.
 
 ## Downloading Artifacts
 See [downloading Spring artifacts][] for Maven repository information. Unable to
-use Maven or other transitive dependency management tools?
-See [building a distribution with dependencies][].
+use Maven or other transitive dependency management tools? See [building a
+distribution with dependencies][].
 
 ## Documentation
 See the current [Javadoc][] and [reference docs][].
 
 ## Getting Support
-Check out the [spring][spring tags] tags on [Stack Overflow][]. [Commercial support][]
+Check out the [Spring forums][] and the [spring][spring tag] and
+[spring-mvc][spring-mvc tag] tags on [Stack Overflow][]. [Commercial support][]
 is available too.
 
 ## Issue Tracking
-Report issues via the [Spring Framework JIRA][]. Understand our issue management
+Report issues via the [Spring Framework JIRA]. Understand our issue management
 process by reading about [the lifecycle of an issue][]. Think you've found a
 bug? Please consider submitting a reproduction project via the
 [spring-framework-issues][] GitHub repository. The [readme][] there provides
@@ -36,7 +37,7 @@ a cross-platform, self-contained bootstrap mechanism for the build.
 
 ### Prerequisites
 
-[Git][] and [JDK 8 update 20 or later][JDK8 build]
+[Git][] and [OpenJDK 8 early access build 100 or later][JDK8 build]
 
 Be sure that your `JAVA_HOME` environment variable points to the `jdk1.8.0` folder
 extracted from the JDK download.
@@ -76,7 +77,9 @@ The Spring Framework is released under version 2.0 of the [Apache License][].
 [building a distribution with dependencies]: https://github.com/spring-projects/spring-framework/wiki/Building-a-distribution-with-dependencies
 [Javadoc]: http://docs.spring.io/spring-framework/docs/current/javadoc-api/
 [reference docs]: http://docs.spring.io/spring-framework/docs/current/spring-framework-reference/
-[spring tags]: http://spring.io/questions
+[Spring forums]: http://forum.spring.io/
+[spring tag]: http://stackoverflow.com/questions/tagged/spring
+[spring-mvc tag]: http://stackoverflow.com/questions/tagged/spring-mvc
 [Stack Overflow]: http://stackoverflow.com/faq
 [Commercial support]: http://spring.io/services
 [Spring Framework JIRA]: https://jira.spring.io/browse/SPR
@@ -86,13 +89,13 @@ The Spring Framework is released under version 2.0 of the [Apache License][].
 [Gradle]: http://gradle.org
 [`./gradlew`]: http://vimeo.com/34436402
 [Git]: http://help.github.com/set-up-git-redirect
-[JDK8 build]: http://www.oracle.com/technetwork/java/javase/downloads
+[JDK8 build]: http://jdk8.java.net/download.html
 [Gradle build and release FAQ]: https://github.com/spring-projects/spring-framework/wiki/Gradle-build-and-release-FAQ
 [Pull requests]: http://help.github.com/send-pull-requests
 [contributor guidelines]: https://github.com/spring-projects/spring-framework/blob/master/CONTRIBUTING.md
 [@SpringFramework]: https://twitter.com/springframework
 [@SpringCentral]: https://twitter.com/springcentral
-[team members]: https://twitter.com/springframework/lists/team/members
+[team members]: https://twitter.com/springframework/team/members
 [The Spring Blog]: http://spring.io/blog/
 [news feed]: http://spring.io/blog/category/news
 [Apache License]: http://www.apache.org/licenses/LICENSE-2.0

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 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.
@@ -68,8 +68,8 @@ class MergePlugin implements Plugin<Project> {
 		Configuration runtimeMerge = project.configurations.create("runtimeMerge")
 
 		// Ensure the IDE can reference merged projects
-		project.eclipse.classpath.plusConfigurations += [ runtimeMerge ]
-		project.idea.module.scopes.PROVIDED.plus += [ runtimeMerge ]
+		project.eclipse.classpath.plusConfigurations += [runtimeMerge]
+		project.idea.module.scopes.PROVIDED.plus += runtimeMerge
 
 		// Hook to perform the actual merge logic
 		project.afterEvaluate{
@@ -132,9 +132,8 @@ class MergePlugin implements Plugin<Project> {
 						intoConfiguration.dependencies.add(it)
 					}
 				}
-				def index = project.parent.childProjects.findIndexOf {p -> p.getValue() == project}
 				project.merge.into.install.repositories.mavenInstaller.pom.scopeMappings.addMapping(
-					mapping.priority + 100 + index, intoConfiguration, mapping.scope)
+					mapping.priority + 100, intoConfiguration, mapping.scope)
 			}
 		}
 	}

gradle.properties

@@ -1 +1 @@
-version=4.2.2.RELEASE
+version=4.0.10.BUILD-SNAPSHOT

gradle/ide.gradle

@@ -5,19 +5,19 @@ 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.8
-	targetCompatibility = 1.8
+	sourceCompatibility = 1.7
+	targetCompatibility = 1.7
 }
 
 // Replace classpath entries with project dependencies (GRADLE-1116)
-// http://issues.gradle.org/browse/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)
 	def projectOutputDependencies = classpath.entries.findAll { entry -> entry.path =~ regexp }
 	projectOutputDependencies.each { entry ->
 		def matcher = (entry.path =~ regexp)
-		if (matcher) {
+		if(matcher) {
 			def projectName = matcher[0][1]
 			def path = "/${projectName}"
 			if(!classpath.entries.find { e -> e instanceof ProjectDependency && e.path == path }) {
@@ -58,9 +58,10 @@ eclipse.classpath.file.whenMerged { classpath ->
 	}
 }
 
-// Allow projects to be used as WTP modules
+// Allow projects to be used as WPT modules
 eclipse.project.natures "org.eclipse.wst.common.project.facet.core.nature"
 
+
 // Include project specific settings
 task eclipseSettings(type: Copy) {
 	from rootProject.files(
@@ -85,8 +86,8 @@ task eclipseJdtPrepare(type: Copy) {
 }
 
 task cleanEclipseJdtUi(type: Delete) {
-	delete project.file(".settings/org.eclipse.jdt.core.prefs")
 	delete project.file(".settings/org.eclipse.jdt.ui.prefs")
+	delete project.file("org.eclipse.jdt.core.prefs")
 	delete project.file(".settings/org.eclipse.wst.common.component")
 	delete project.file(".settings/org.eclipse.wst.common.project.facet.core.xml")
 }
@@ -97,6 +98,7 @@ tasks["eclipse"].dependsOn(eclipseSettings, eclipseWstComponent)
 
 
 // Filter 'build' folder
+
 eclipse.project.file.withXml {
 	def node = it.asNode()
 

gradle/publish-maven.gradle

@@ -25,12 +25,12 @@ def customizePom(pom, gradleProject) {
 			url = "https://github.com/spring-projects/spring-framework"
 			organization {
 				name = "Spring IO"
-				url = "http://projects.spring.io/spring-framework"
+				url = "https://projects.spring.io/spring-framework"
 			}
 			licenses {
 				license {
 					name "The Apache Software License, Version 2.0"
-					url "http://www.apache.org/licenses/LICENSE-2.0.txt"
+					url "https://www.apache.org/licenses/LICENSE-2.0.txt"
 					distribution "repo"
 				}
 			}
@@ -43,7 +43,7 @@ def customizePom(pom, gradleProject) {
 				developer {
 					id = "jhoeller"
 					name = "Juergen Hoeller"
-					email = "jhoeller@pivotal.io"
+					email = "jhoeller@gopivotal.com"
 				}
 			}
 			issueManagement {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Jul 09 16:54:55 EEST 2015
+#Wed Apr 30 13:06:57 CEST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-bin.zip

import-into-eclipse.bat

@@ -17,7 +17,7 @@ echo been tested against STS %STS_TEST_VERSION%), but at the minimum you will
 echo need Eclipse + AJDT.
 echo.
 echo If you need to download and install STS, please do that now by
-echo visiting http://spring.io/tools/sts/all 
+echo visiting https://spring.io/tools/sts/all 
 echo.
 echo Otherwise, press enter and we'll begin.
 

import-into-eclipse.sh

@@ -1,37 +1,22 @@
+STS_TEST_VERSION='2.9.2.RELEASE'
+
 cd `dirname $0`
 clear
 cat <<EOM
 
-------------------------------------------------------------------------
-Spring Framework - Eclipse/STS Project Import Guide
+-----------------------------------------------------------------------
+Spring Framework Eclipse/STS project import guide
 
-This script will guide you through the process of importing the Spring
-Framework projects into Eclipse or the Spring Tool Suite (STS). It is
-recommended that you have a recent version of Eclipse or STS. As a bare
-minimum you will need Eclipse with full Java 8 support, the AspectJ
-Development Tools (AJDT), and the Groovy Compiler.
+This script will guide you through the process of importing the
+Spring Framework sources into Eclipse/STS. It is recommended that you
+have a recent version of the SpringSource Tool Suite (this script has
+been tested against STS $STS_TEST_VERSION), but at the minimum you will
+need Eclipse + AJDT.
 
-This script has been tested against:
+If you need to download and install STS, please do that now by
+visiting https://spring.io/tools/sts/all 
 
-- STS:     3.6.3.RELEASE (Eclipse Luna SR1 4.4.1)
-- AJDT:    2.2.4.e44x-20141118-0700 (Luna 4.4)
-
-If you need to download and install Eclipse or STS, please do that now
-by visiting one of the following sites:
-
-- Eclipse downloads: http://download.eclipse.org/eclipse/downloads
-- STS downloads: http://spring.io/tools/sts/all
-- STS nightly builds: http://dist.springsource.com/snapshot/STS/nightly-distributions.html
-
-If you need to install a recent CI build for AJDT (i.e., so that the
-spring-aspects module properly compiles in Eclipse/STS), click on the
-"Artifacts" tab of a successful CI build and copy the link to the
-"update site" which you can then use to install or update AJDT within
-Eclipse/STS.
-
-- AJDT CI builds: https://build.spring.io/browse/AJDT-AE44
-
-Once Eclipse/STS is installed, press enter, and we'll begin.
+Otherwise, press enter and we'll begin.
 EOM
 
 read
@@ -46,14 +31,14 @@ COMMAND="./gradlew cleanEclipse :spring-oxm:compileTestJava eclipse -x :eclipse"
 
 cat <<EOM
 
-------------------------------------------------------------------------
+-----------------------------------------------------------------------
 STEP 1: Generate subproject Eclipse metadata
 
-The first step will be to generate Eclipse project metadata for each of
-the spring-* subprojects. This happens via the built-in "Gradle wrapper"
-script (./gradlew in this directory). If this is your first time using
-the Gradle wrapper, this step may take a few minutes while a Gradle
-distribution is downloaded for you.
+The first step will be to generate Eclipse project metadata for each
+of the spring-* subprojects. This happens via the built-in
+"Gradle wrapper" script (./gradlew in this directory). If this is your
+first time using the Gradle wrapper, this step may take a few minutes
+while a Gradle distribution is downloaded for you.
 
 The command run will be:
 
@@ -68,16 +53,16 @@ $COMMAND || exit
 
 cat <<EOM
 
-------------------------------------------------------------------------
+-----------------------------------------------------------------------
 STEP 2: Import subprojects into Eclipse/STS
 
 Within Eclipse/STS, do the following:
 
-- File > Import... > Existing Projects into Workspace
-- When prompted for the 'root directory', provide $PWD.
-- Press enter. You will see the modules show up under "Projects".
-- All projects should be selected/checked. Click Finish.
-- When the project import is complete, you should have no errors.
+File > Import... > Existing Projects into Workspace
+   > When prompted for the 'root directory', provide $PWD
+   > Press enter. You will see the modules show up under "Projects"
+   > All projects should be selected/checked. Click Finish.
+   > When the project import is complete, you should have no errors.
 
 When the above is complete, return here and press the enter key.
 EOM
@@ -88,13 +73,13 @@ COMMAND="./gradlew :eclipse"
 
 cat <<EOM
 
-------------------------------------------------------------------------
-STEP 3: Generate root project Eclipse metadata
+-----------------------------------------------------------------------
+STEP 3: generate root project Eclipse metadata
 
-Unfortunately, Eclipse does not support importing project hierarchies,
-so we had to skip root project metadata generation during step 1. In
-this step we simply generate root project metadata so that you can
-import it in the next step.
+Unfortunately, Eclipse does not allow for importing project
+hierarchies, so we had to skip root project metadata generation in the
+during step 1. In this step we simply generate root project metadata
+so you can import it in the next step.
 
 The command run will be:
 
@@ -108,11 +93,11 @@ read
 $COMMAND || exit
 
 cat <<EOM
-------------------------------------------------------------------------
+-----------------------------------------------------------------------
 STEP 4: Import root project into Eclipse/STS
 
 Follow the project import steps listed in step 2 above to import the
-root "spring" project.
+root project.
 
 Press enter when complete, and move on to the final step.
 EOM
@@ -120,14 +105,14 @@ EOM
 read
 
 cat <<EOM
-------------------------------------------------------------------------
+-----------------------------------------------------------------------
 STEP 5: Enable Git support for all projects
 
 - In the Eclipse/STS Package Explorer, select all spring* projects.
 - Right-click to open the context menu and select Team > Share Project...
-- In the Share Project dialog that appears, select Git and press Next.
-- Check "Use or create repository in parent folder of project".
-- Click Finish.
+- In the Share Project dialog that appears, select Git and press Next
+- Check "Use or create repository in parent folder of project"
+- Click Finish
 
 When complete, you'll have Git support enabled for all projects.
 

import-into-idea.md

@@ -1,21 +1,21 @@
-The following has been tested against Intellij IDEA 13.1
+The following has been tested against Intellij IDEA 12.0
 
 ## Steps
 
 _Within your locally cloned spring-framework working directory:_
 
-1. Pre-compile `spring-oxm` with `./gradlew cleanIdea :spring-oxm:compileTestJava`
-2. Import into IDEA (File->import project->import from external model->Gradle)
-3. Set the Project JDK as appropriate (1.8+)
-4. Exclude the `spring-aspects` module (Go to File->Project Structure->Modules)
+1. Generate IDEA metadata with `./gradlew :spring-oxm:compileTestJava cleanIdea idea`
+2. Import into IDEA as usual
+3. Set the Project JDK as appropriate
+4. Add git support
 5. Code away
 
 ## Known issues
 
-1. `spring-oxm` should be pre-compiled since it's using repackaged dependencies (see *RepackJar tasks)
+1. Those steps don't work currently for Intellij IDEA 13+
 2. `spring-aspects` does not compile out of the box due to references to aspect types unknown to IDEA.
 See http://youtrack.jetbrains.com/issue/IDEA-64446 for details. In the meantime, the 'spring-aspects'
-should be excluded from the overall project to avoid compilation errors.
+module has been excluded from the overall project to avoid compilation errors.
 3. While all JUnit tests pass from the command line with Gradle, many will fail when run from IDEA.
 Resolving this is a work in progress. If attempting to run all JUnit tests from within IDEA, you will
 likely need to set the following VM options to avoid out of memory errors:

settings.gradle

@@ -15,14 +15,13 @@ include "spring-jms"
 include "spring-messaging"
 include "spring-orm"
 include "spring-orm-hibernate4"
-include "spring-orm-hibernate5"
 include "spring-oxm"
 include "spring-test"
 include "spring-tx"
 include "spring-web"
 include "spring-webmvc"
 include "spring-webmvc-portlet"
-include "spring-webmvc-tiles2"
+include "spring-webmvc-tiles3"
 include "spring-websocket"
 include "spring-framework-bom"
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ package org.springframework.aop;
  * Minimal interface for exposing the target class behind a proxy.
  *
  * <p>Implemented by AOP proxy objects and proxy factories
- * (via {@link org.springframework.aop.framework.Advised})
+ * (via {@link org.springframework.aop.framework.Advised}}
  * as well as by {@link TargetSource TargetSources}.
  *
  * @author Juergen Hoeller

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -381,7 +381,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 	}
 
 	private boolean maybeBindJoinPoint(Class<?> candidateParameterType) {
-		if (JoinPoint.class == candidateParameterType) {
+		if (candidateParameterType.equals(JoinPoint.class)) {
 			this.joinPointArgumentIndex = 0;
 			return true;
 		}
@@ -391,7 +391,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 	}
 
 	private boolean maybeBindProceedingJoinPoint(Class<?> candidateParameterType) {
-		if (ProceedingJoinPoint.class == candidateParameterType) {
+		if (candidateParameterType.equals(ProceedingJoinPoint.class)) {
 			if (!supportsProceedingJoinPoint()) {
 				throw new IllegalArgumentException("ProceedingJoinPoint is only supported for around advice");
 			}
@@ -408,7 +408,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 	}
 
 	private boolean maybeBindJoinPointStaticPart(Class<?> candidateParameterType) {
-		if (JoinPoint.StaticPart.class == candidateParameterType) {
+		if (candidateParameterType.equals(JoinPoint.StaticPart.class)) {
 			this.joinPointStaticPartArgumentIndex = 0;
 			return true;
 		}

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

@@ -28,7 +28,6 @@ import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.weaver.tools.PointcutParser;
 import org.aspectj.weaver.tools.PointcutPrimitive;
-
 import org.springframework.core.ParameterNameDiscoverer;
 import org.springframework.util.StringUtils;
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 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.
@@ -93,7 +93,7 @@ public class AspectJAfterReturningAdvice extends AbstractAspectJAdvice implement
 		if (returnValue != null) {
 			return ClassUtils.isAssignableValue(type, returnValue);
 		}
-		else if (Object.class == type && void.class == method.getReturnType()) {
+		else if (type.equals(Object.class) && method.getReturnType().equals(void.class)) {
 			return true;
 		}
 		else{

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 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.
@@ -19,7 +19,6 @@ package org.springframework.aop.aspectj;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.lang.reflect.Method;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -204,7 +203,8 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 			pointcutParameters[i] = parser.createPointcutParameter(
 					this.pointcutParameterNames[i], this.pointcutParameterTypes[i]);
 		}
-		return parser.parsePointcutExpression(replaceBooleanOperators(getExpression()),
+		return parser.parsePointcutExpression(
+				replaceBooleanOperators(getExpression()),
 				this.pointcutDeclarationScope, pointcutParameters);
 	}
 
@@ -327,41 +327,29 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 		catch (IllegalStateException ex) {
 			// No current invocation...
 			// TODO: Should we really proceed here?
-			if (logger.isDebugEnabled()) {
-				logger.debug("Could not access current invocation - matching with limited context: " + ex);
-			}
+			logger.debug("Couldn't access current invocation - matching with limited context: " + ex);
 		}
 
-		try {
-			JoinPointMatch joinPointMatch = shadowMatch.matchesJoinPoint(thisObject, targetObject, args);
+		JoinPointMatch joinPointMatch = shadowMatch.matchesJoinPoint(thisObject, targetObject, args);
 
-			/*
-			 * Do a final check to see if any this(TYPE) kind of residue match. For
-			 * this purpose, we use the original method's (proxy method's) shadow to
-			 * ensure that 'this' is correctly checked against. Without this check,
-			 * we get incorrect match on this(TYPE) where TYPE matches the target
-			 * type but not 'this' (as would be the case of JDK dynamic proxies).
-			 * <p>See SPR-2979 for the original bug.
-			 */
-			if (pmi != null) {  // there is a current invocation
-				RuntimeTestWalker originalMethodResidueTest = getRuntimeTestWalker(originalShadowMatch);
-				if (!originalMethodResidueTest.testThisInstanceOfResidue(thisObject.getClass())) {
-					return false;
-				}
-				if (joinPointMatch.matches()) {
-					bindParameters(pmi, joinPointMatch);
-				}
+		/*
+		 * Do a final check to see if any this(TYPE) kind of residue match. For
+		 * this purpose, we use the original method's (proxy method's) shadow to
+		 * ensure that 'this' is correctly checked against. Without this check,
+		 * we get incorrect match on this(TYPE) where TYPE matches the target
+		 * type but not 'this' (as would be the case of JDK dynamic proxies).
+		 * <p>See SPR-2979 for the original bug.
+		 */
+		if (pmi != null) {  // there is a current invocation
+			RuntimeTestWalker originalMethodResidueTest = getRuntimeTestWalker(originalShadowMatch);
+			if (!originalMethodResidueTest.testThisInstanceOfResidue(thisObject.getClass())) {
+				return false;
 			}
-
-			return joinPointMatch.matches();
-		}
-		catch (Throwable ex) {
-			if (logger.isDebugEnabled()) {
-				logger.debug("Failed to evaluate join point for arguments " + Arrays.asList(args) +
-						" - falling back to non-match", ex);
+			if (joinPointMatch.matches()) {
+				bindParameters(pmi, joinPointMatch);
 			}
-			return false;
 		}
+		return joinPointMatch.matches();
 	}
 
 	protected String getCurrentProxiedBeanName() {

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

@@ -50,7 +50,7 @@ import org.springframework.util.ReflectionUtils;
  * migrate to {@code ShadowMatch.getVariablesInvolvedInRuntimeTest()}
  * or some similar operation.
  *
- * <p>See <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=151593"/>Bug 151593</a>
+ * <p>See <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=151593"/>.
  *
  * @author Adrian Colyer
  * @author Ramnivas Laddad

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

@@ -37,7 +37,6 @@ import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.AjType;
 import org.aspectj.lang.reflect.AjTypeSystem;
 import org.aspectj.lang.reflect.PerClauseKind;
-
 import org.springframework.aop.aspectj.AspectJExpressionPointcut;
 import org.springframework.aop.framework.AopConfigException;
 import org.springframework.core.ParameterNameDiscoverer;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 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.
@@ -27,7 +27,7 @@ import org.springframework.aop.aspectj.AspectJProxyUtils;
 import org.springframework.aop.framework.AopConfigException;
 import org.springframework.aop.framework.ProxyCreatorSupport;
 import org.springframework.aop.support.AopUtils;
-import org.springframework.core.annotation.AnnotationAwareOrderComparator;
+import org.springframework.core.OrderComparator;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
@@ -76,7 +76,7 @@ public class AspectJProxyFactory extends ProxyCreatorSupport {
 	 * Create a new {@code AspectJProxyFactory}.
 	 * No target, only interfaces. Must add interceptors.
 	 */
-	public AspectJProxyFactory(Class<?>... interfaces) {
+	public AspectJProxyFactory(Class<?>[] interfaces) {
 		setInterfaces(interfaces);
 	}
 
@@ -121,7 +121,7 @@ public class AspectJProxyFactory extends ProxyCreatorSupport {
 		List<Advisor> advisors = this.aspectFactory.getAdvisors(instanceFactory);
 		advisors = AopUtils.findAdvisorsThatCanApply(advisors, getTargetClass());
 		AspectJProxyUtils.makeAdvisorChainAspectJCapableIfNecessary(advisors);
-		AnnotationAwareOrderComparator.sort(advisors);
+		OrderComparator.sort(advisors);
 		addAdvisors(advisors);
 	}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 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.
@@ -72,7 +72,7 @@ public class AspectMetadata {
 
 		Class<?> currClass = aspectClass;
 		AjType<?> ajType = null;
-		while (currClass != Object.class) {
+		while (!currClass.equals(Object.class)) {
 			AjType<?> ajTypeToCheck = AjTypeSystem.getAjType(currClass);
 			if (ajTypeToCheck.isAspect()) {
 				ajType = ajTypeToCheck;

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

@@ -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.
@@ -19,7 +19,8 @@ package org.springframework.aop.aspectj.annotation;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.core.Ordered;
-import org.springframework.core.annotation.OrderUtils;
+import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.core.annotation.Order;
 import org.springframework.util.ClassUtils;
 
 /**
@@ -109,7 +110,10 @@ public class BeanFactoryAspectInstanceFactory implements MetadataAwareAspectInst
 			if (Ordered.class.isAssignableFrom(type) && this.beanFactory.isSingleton(this.name)) {
 				return ((Ordered) this.beanFactory.getBean(this.name)).getOrder();
 			}
-			return OrderUtils.getOrder(type, Ordered.LOWEST_PRECEDENCE);
+			Order order = AnnotationUtils.findAnnotation(type, Order.class);
+			if (order != null) {
+				return order.value();
+			}
 		}
 		return Ordered.LOWEST_PRECEDENCE;
 	}

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

@@ -157,7 +157,7 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 			return null;
 		}
 
-		if (DeclareParents.class == declareParents.defaultImpl()) {
+		if (DeclareParents.class.equals(declareParents.defaultImpl())) {
 			// This is what comes back if it wasn't set. This seems bizarre...
 			// TODO this restriction possibly should be relaxed
 			throw new IllegalStateException("defaultImpl must be set on DeclareParents");

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

@@ -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.
@@ -18,7 +18,8 @@ package org.springframework.aop.aspectj.annotation;
 
 import org.springframework.aop.aspectj.SimpleAspectInstanceFactory;
 import org.springframework.core.Ordered;
-import org.springframework.core.annotation.OrderUtils;
+import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.core.annotation.Order;
 
 /**
  * Implementation of {@link MetadataAwareAspectInstanceFactory} that
@@ -50,9 +51,20 @@ public class SimpleMetadataAwareAspectInstanceFactory extends SimpleAspectInstan
 		return this.metadata;
 	}
 
+	/**
+	 * Determine a fallback order for the case that the aspect instance
+	 * does not express an instance-specific order through implementing
+	 * the {@link org.springframework.core.Ordered} interface.
+	 * <p>The default implementation simply returns {@code Ordered.LOWEST_PRECEDENCE}.
+	 * @param aspectClass the aspect class
+	 */
 	@Override
 	protected int getOrderForAspectClass(Class<?> aspectClass) {
-		return OrderUtils.getOrder(aspectClass, Ordered.LOWEST_PRECEDENCE);
+		Order order = AnnotationUtils.findAnnotation(aspectClass, Order.class);
+		if (order != null) {
+			return order.value();
+		}
+		return Ordered.LOWEST_PRECEDENCE;
 	}
 
 }

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

@@ -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.
@@ -18,7 +18,8 @@ package org.springframework.aop.aspectj.annotation;
 
 import org.springframework.aop.aspectj.SingletonAspectInstanceFactory;
 import org.springframework.core.Ordered;
-import org.springframework.core.annotation.OrderUtils;
+import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.core.annotation.Order;
 
 /**
  * Implementation of {@link MetadataAwareAspectInstanceFactory} that is backed
@@ -52,9 +53,19 @@ public class SingletonMetadataAwareAspectInstanceFactory extends SingletonAspect
 		return this.metadata;
 	}
 
+	/**
+	 * Check whether the aspect class carries an
+	 * {@link org.springframework.core.annotation.Order} annotation,
+	 * falling back to {@code Ordered.LOWEST_PRECEDENCE}.
+	 * @see org.springframework.core.annotation.Order
+	 */
 	@Override
 	protected int getOrderForAspectClass(Class<?> aspectClass) {
-		return OrderUtils.getOrder(aspectClass, Ordered.LOWEST_PRECEDENCE);
+		Order order = AnnotationUtils.findAnnotation(aspectClass, Order.class);
+		if (order != null) {
+			return order.value();
+		}
+		return Ordered.LOWEST_PRECEDENCE;
 	}
 
 }

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

@@ -1,6 +1,10 @@
+
 /**
+ *
  * Classes enabling AspectJ 5 @Annotated classes to be used in Spring AOP.
  *
  * <p>Normally to be used through an AspectJAutoProxyCreator rather than directly.
+ *
  */
 package org.springframework.aop.aspectj.annotation;
+

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 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,7 +21,7 @@ import java.util.Comparator;
 import org.springframework.aop.Advisor;
 import org.springframework.aop.aspectj.AspectJAopUtils;
 import org.springframework.aop.aspectj.AspectJPrecedenceInformation;
-import org.springframework.core.annotation.AnnotationAwareOrderComparator;
+import org.springframework.core.OrderComparator;
 import org.springframework.util.Assert;
 
 /**
@@ -29,13 +29,15 @@ import org.springframework.util.Assert;
  *
  * <p>Given two pieces of advice, {@code a} and {@code b}:
  * <ul>
- * <li>if {@code a} and {@code b} are defined in different aspects, then the advice
- * in the aspect with the lowest order value has the highest precedence</li>
- * <li>if {@code a} and {@code b} are defined in the same aspect, then if one of
- * {@code a} or {@code b} is a form of after advice, then the advice declared last
- * in the aspect has the highest precedence. If neither {@code a} nor {@code b} is
- * a form of after advice, then the advice declared first in the aspect has the
- * highest precedence.</li>
+ *   <li>if {@code a} and {@code b} are defined in different
+ *   aspects, then the advice in the aspect with the lowest order
+ *   value has the highest precedence</li>
+ *   <li>if {@code a} and {@code b} are defined in the same
+ *   aspect, then if one of {@code a} or {@code b} is a form of
+ *   after advice, then the advice declared last in the aspect has the
+ *   highest precedence. If neither {@code a} nor {@code b} is a
+ *   form of after advice, then the advice declared first in the aspect has
+ *   the highest precedence.</li>
  * </ul>
  *
  * <p>Important: Note that unlike a normal comparator a return of 0 means
@@ -49,12 +51,9 @@ import org.springframework.util.Assert;
 class AspectJPrecedenceComparator implements Comparator<Advisor> {
 
 	private static final int HIGHER_PRECEDENCE = -1;
-
 	private static final int SAME_PRECEDENCE = 0;
-
 	private static final int LOWER_PRECEDENCE = 1;
 
-
 	private final Comparator<? super Advisor> advisorComparator;
 
 
@@ -62,7 +61,7 @@ class AspectJPrecedenceComparator implements Comparator<Advisor> {
 	 * Create a default AspectJPrecedenceComparator.
 	 */
 	public AspectJPrecedenceComparator() {
-		this.advisorComparator = AnnotationAwareOrderComparator.INSTANCE;
+		this.advisorComparator = OrderComparator.INSTANCE;
 	}
 
 	/**

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

@@ -1,5 +1,9 @@
+
 /**
+ *
  * Base classes enabling auto-proxying based on AspectJ.
  * Support for AspectJ annotation aspects resides in the "aspectj.annotation" package.
+ *
  */
 package org.springframework.aop.aspectj.autoproxy;
+

spring-aop/src/main/java/org/springframework/aop/aspectj/package-info.java

@@ -1,4 +1,5 @@
 /**
+ *
  * AspectJ integration package. Includes Spring AOP advice implementations for AspectJ 5
  * annotation-style methods, and an AspectJExpressionPointcut: a Spring AOP Pointcut
  * implementation that allows use of the AspectJ pointcut expression language with the Spring AOP
@@ -7,5 +8,7 @@
  * <p>Note that use of this package does <i>not</i> require the use of the {@code ajc} compiler
  * or AspectJ load-time weaver. It is intended to enable the use of a valuable subset of AspectJ
  * functionality, with consistent semantics, with the proxy-based Spring AOP framework.
+ *
  */
 package org.springframework.aop.aspectj;
+

spring-aop/src/main/java/org/springframework/aop/config/package-info.java

@@ -1,5 +1,9 @@
+
 /**
+ *
  * Support package for declarative AOP configuration,
  * with XML schema being the primary configuration format.
+ *
  */
 package org.springframework.aop.config;
+

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

@@ -21,7 +21,10 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import org.springframework.aop.Advisor;
 import org.springframework.aop.support.AopUtils;
+import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.core.Ordered;
+import org.springframework.util.ClassUtils;
 
 /**
  * Base class for {@link BeanPostProcessor} implementations that apply a
@@ -31,12 +34,21 @@ import org.springframework.beans.factory.config.BeanPostProcessor;
  * @since 3.2
  */
 @SuppressWarnings("serial")
-public abstract class AbstractAdvisingBeanPostProcessor extends ProxyProcessorSupport implements BeanPostProcessor {
+public abstract class AbstractAdvisingBeanPostProcessor extends ProxyConfig
+		implements BeanPostProcessor, BeanClassLoaderAware, Ordered {
 
 	protected Advisor advisor;
 
 	protected boolean beforeExistingAdvisors = false;
 
+	private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader();
+
+	/**
+	 * This should run after all other post-processors, so that it can just add
+	 * an advisor to existing proxies rather than double-proxy.
+	 */
+	private int order = Ordered.LOWEST_PRECEDENCE;
+
 	private final Map<Class<?>, Boolean> eligibleBeans = new ConcurrentHashMap<Class<?>, Boolean>(64);
 
 
@@ -53,6 +65,20 @@ public abstract class AbstractAdvisingBeanPostProcessor extends ProxyProcessorSu
 		this.beforeExistingAdvisors = beforeExistingAdvisors;
 	}
 
+	@Override
+	public void setBeanClassLoader(ClassLoader beanClassLoader) {
+		this.beanClassLoader = beanClassLoader;
+	}
+
+	public void setOrder(int order) {
+		this.order = order;
+	}
+
+	@Override
+	public int getOrder() {
+		return this.order;
+	}
+
 
 	@Override
 	public Object postProcessBeforeInitialization(Object bean, String beanName) {
@@ -81,14 +107,11 @@ public abstract class AbstractAdvisingBeanPostProcessor extends ProxyProcessorSu
 		}
 
 		if (isEligible(bean, beanName)) {
-			ProxyFactory proxyFactory = new ProxyFactory();
+			ProxyFactory proxyFactory = new ProxyFactory(bean);
+			// Copy our properties (proxyTargetClass etc) inherited from ProxyConfig.
 			proxyFactory.copyFrom(this);
-			proxyFactory.setTarget(bean);
-			if (!proxyFactory.isProxyTargetClass()) {
-				evaluateProxyInterfaces(bean.getClass(), proxyFactory);
-			}
 			proxyFactory.addAdvisor(this.advisor);
-			return proxyFactory.getProxy(getProxyClassLoader());
+			return proxyFactory.getProxy(this.beanClassLoader);
 		}
 
 		// No async proxy needed.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 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.
@@ -66,7 +66,7 @@ public abstract class AbstractSingletonProxyFactoryBean extends ProxyConfig
 	 * @see org.springframework.aop.target.SingletonTargetSource
 	 * @see org.springframework.aop.target.LazyInitTargetSource
 	 * @see org.springframework.aop.target.PrototypeTargetSource
-	 * @see org.springframework.aop.target.CommonsPool2TargetSource
+	 * @see org.springframework.aop.target.CommonsPoolTargetSource
 	 */
 	public void setTarget(Object target) {
 		this.target = target;
@@ -173,8 +173,6 @@ public abstract class AbstractSingletonProxyFactoryBean extends ProxyConfig
 					ClassUtils.getAllInterfacesForClass(targetSource.getTargetClass(), this.proxyClassLoader));
 		}
 
-		postProcessProxyFactory(proxyFactory);
-
 		this.proxy = proxyFactory.getProxy(this.proxyClassLoader);
 	}
 
@@ -193,15 +191,6 @@ public abstract class AbstractSingletonProxyFactoryBean extends ProxyConfig
 		}
 	}
 
-	/**
-	 * A hook for subclasses to post-process the {@link ProxyFactory}
-	 * before creating the proxy instance with it.
-	 * @param proxyFactory the AOP ProxyFactory about to be used
-	 * @since 4.2
-	 */
-	protected void postProcessProxyFactory(ProxyFactory proxyFactory) {
-	}
-
 
 	@Override
 	public Object getObject() {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 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,7 +25,7 @@ import org.springframework.aop.TargetSource;
 /**
  * Interface to be implemented by classes that hold the configuration
  * of a factory of AOP proxies. This configuration includes the
- * Interceptors and other advice, Advisors, and the proxied interfaces.
+ * Interceptors and other advice, and Advisors, and the proxied interfaces.
  *
  * <p>Any AOP proxy obtained from Spring can be cast to this interface to
  * allow manipulation of its AOP advice.
@@ -49,8 +49,8 @@ public interface Advised extends TargetClassAware {
 	boolean isProxyTargetClass();
 
 	/**
-	 * Return the interfaces proxied by the AOP proxy.
-	 * <p>Will not include the target class, which may also be proxied.
+	 * Return the interfaces proxied by the AOP proxy. Will not
+	 * include the target class, which may also be proxied.
 	 */
 	Class<?>[] getProxiedInterfaces();
 
@@ -60,34 +60,33 @@ public interface Advised extends TargetClassAware {
 	 */
 	boolean isInterfaceProxied(Class<?> intf);
 
+
 	/**
-	 * Change the {@code TargetSource} used by this {@code Advised} object.
-	 * <p>Only works if the configuration isn't {@linkplain #isFrozen frozen}.
+	 * Change the TargetSource used by this Advised object.
+	 * Only works if the configuration isn't frozen.
 	 * @param targetSource new TargetSource to use
 	 */
 	void setTargetSource(TargetSource targetSource);
 
 	/**
-	 * Return the {@code TargetSource} used by this {@code Advised} object.
+	 * Return the TargetSource used by this Advised object.
 	 */
 	TargetSource getTargetSource();
 
 	/**
 	 * Set whether the proxy should be exposed by the AOP framework as a
-	 * {@link ThreadLocal} for retrieval via the {@link AopContext} class.
-	 * <p>It can be necessary to expose the proxy if an advised object needs
-	 * to invoke a method on itself with advice applied. Otherwise, if an
-	 * advised object invokes a method on {@code this}, no advice will be applied.
-	 * <p>Default is {@code false}, for optimal performance.
+	 * ThreadLocal for retrieval via the AopContext class. This is useful
+	 * if an advised object needs to call another advised method on itself.
+	 * (If it uses {@code this}, the invocation will not be advised).
+	 * <p>Default is "false", for optimal performance.
 	 */
 	void setExposeProxy(boolean exposeProxy);
 
 	/**
-	 * Return whether the factory should expose the proxy as a {@link ThreadLocal}.
-	 * <p>It can be necessary to expose the proxy if an advised object needs
-	 * to invoke a method on itself with advice applied. Otherwise, if an
-	 * advised object invokes a method on {@code this}, no advice will be applied.
-	 * <p>Getting the proxy is analogous to an EJB calling {@code getEJBObject()}.
+	 * Return whether the factory should expose the proxy as a ThreadLocal.
+	 * This can be necessary if a target object needs to invoke a method on itself
+	 * benefitting from advice. (If it invokes a method on {@code this} no advice
+	 * will apply.) Getting the proxy is analogous to an EJB calling getEJBObject().
 	 * @see AopContext
 	 */
 	boolean isExposeProxy();
@@ -108,6 +107,7 @@ public interface Advised extends TargetClassAware {
 	 */
 	boolean isPreFiltered();
 
+
 	/**
 	 * Return the advisors applying to this proxy.
 	 * @return a list of Advisors applying to this proxy (never {@code null})
@@ -170,6 +170,7 @@ public interface Advised extends TargetClassAware {
 	 */
 	boolean replaceAdvisor(Advisor a, Advisor b) throws AopConfigException;
 
+
 	/**
 	 * Add the given AOP Alliance advice to the tail of the advice (interceptor) chain.
 	 * <p>This will be wrapped in a DefaultPointcutAdvisor with a pointcut that always
@@ -216,6 +217,7 @@ public interface Advised extends TargetClassAware {
 	 */
 	int indexOf(Advice advice);
 
+
 	/**
 	 * As {@code toString()} will normally be delegated to the target,
 	 * this returns the equivalent for the AOP proxy.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 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.
@@ -16,7 +16,6 @@
 
 package org.springframework.aop.framework;
 
-import java.lang.reflect.Proxy;
 import java.util.Arrays;
 
 import org.springframework.aop.SpringProxy;
@@ -41,11 +40,11 @@ public abstract class AopProxyUtils {
 
 	/**
 	 * Determine the ultimate target class of the given bean instance, traversing
-	 * not only a top-level proxy but any number of nested proxies as well —
+	 * not only a top-level proxy but any number of nested proxies as well -
 	 * as long as possible without side effects, that is, just for singleton targets.
 	 * @param candidate the instance to check (might be an AOP proxy)
-	 * @return the ultimate target class (or the plain class of the given
-	 * object as fallback; never {@code null})
+	 * @return the target class (or the plain class of the given object as fallback;
+	 * never {@code null})
 	 * @see org.springframework.aop.TargetClassAware#getTargetClass()
 	 * @see Advised#getTargetSource()
 	 */
@@ -84,14 +83,8 @@ public abstract class AopProxyUtils {
 		if (specifiedInterfaces.length == 0) {
 			// No user-specified interfaces: check whether target class is an interface.
 			Class<?> targetClass = advised.getTargetClass();
-			if (targetClass != null) {
-				if (targetClass.isInterface()) {
-					advised.setInterfaces(targetClass);
-				}
-				else if (Proxy.isProxyClass(targetClass)) {
-					advised.setInterfaces(targetClass.getInterfaces());
-				}
-				specifiedInterfaces = advised.getProxiedInterfaces();
+			if (targetClass != null && targetClass.isInterface()) {
+				specifiedInterfaces = new Class<?>[] {targetClass};
 			}
 		}
 		boolean addSpringProxy = !advised.isInterfaceProxied(SpringProxy.class);

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -102,9 +102,9 @@ class CglibAopProxy implements AopProxy, Serializable {
 	/** The configuration used to configure this proxy */
 	protected final AdvisedSupport advised;
 
-	protected Object[] constructorArgs;
+	private Object[] constructorArgs;
 
-	protected Class<?>[] constructorArgTypes;
+	private Class<?>[] constructorArgTypes;
 
 	/** Dispatcher used for methods on Advised */
 	private final transient AdvisedDispatcher advisedDispatcher;
@@ -172,7 +172,7 @@ class CglibAopProxy implements AopProxy, Serializable {
 			}
 
 			// Validate the class, writing log messages as necessary.
-			validateClassIfNecessary(proxySuperClass, classLoader);
+			validateClassIfNecessary(proxySuperClass);
 
 			// Configure CGLIB Enhancer...
 			Enhancer enhancer = createEnhancer();
@@ -239,11 +239,11 @@ class CglibAopProxy implements AopProxy, Serializable {
 	 * Checks to see whether the supplied {@code Class} has already been validated and
 	 * validates it if not.
 	 */
-	private void validateClassIfNecessary(Class<?> proxySuperClass, ClassLoader proxyClassLoader) {
-		if (logger.isInfoEnabled()) {
+	private void validateClassIfNecessary(Class<?> proxySuperClass) {
+		if (logger.isWarnEnabled()) {
 			synchronized (validatedClasses) {
 				if (!validatedClasses.containsKey(proxySuperClass)) {
-					doValidateClass(proxySuperClass, proxyClassLoader);
+					doValidateClass(proxySuperClass);
 					validatedClasses.put(proxySuperClass, Boolean.TRUE);
 				}
 			}
@@ -251,28 +251,19 @@ class CglibAopProxy implements AopProxy, Serializable {
 	}
 
 	/**
-	 * Checks for final methods on the given {@code Class}, as well as package-visible
-	 * methods across ClassLoaders, and writes warnings to the log for each one found.
+	 * Checks for final methods on the {@code Class} and writes warnings to the log
+	 * for each one found.
 	 */
-	private void doValidateClass(Class<?> proxySuperClass, ClassLoader proxyClassLoader) {
-		if (Object.class != proxySuperClass) {
-			Method[] methods = proxySuperClass.getDeclaredMethods();
+	private void doValidateClass(Class<?> proxySuperClass) {
+		if (logger.isWarnEnabled()) {
+			Method[] methods = proxySuperClass.getMethods();
 			for (Method method : methods) {
-				int mod = method.getModifiers();
-				if (!Modifier.isStatic(mod)) {
-					if (Modifier.isFinal(mod)) {
-						logger.info("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.");
-					}
-					else if (!Modifier.isPublic(mod) && !Modifier.isProtected(mod) && !Modifier.isPrivate(mod) &&
-							proxyClassLoader != null && proxySuperClass.getClassLoader() != proxyClassLoader) {
-						logger.info("Unable to proxy method [" + method + "] because it is package-visible " +
-								"across different ClassLoaders: All calls to this method via a proxy will " +
-								"NOT be routed to the target instance.");
-					}
+				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.");
 				}
 			}
-			doValidateClass(proxySuperClass.getSuperclass(), proxyClassLoader);
 		}
 	}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 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.
@@ -17,23 +17,25 @@
 package org.springframework.aop.framework;
 
 import java.io.Serializable;
-import java.lang.reflect.Proxy;
 
 import org.springframework.aop.SpringProxy;
 
 /**
- * Default {@link AopProxyFactory} implementation, creating either a CGLIB proxy
- * or a JDK dynamic proxy.
+ * Default {@link AopProxyFactory} implementation,
+ * creating either a CGLIB proxy or a JDK dynamic proxy.
  *
- * <p>Creates a CGLIB proxy if one the following is true for a given
- * {@link AdvisedSupport} instance:
+ * <p>Creates a CGLIB proxy if one the following is true
+ * for a given {@link AdvisedSupport} instance:
  * <ul>
- * <li>the {@code optimize} flag is set
- * <li>the {@code proxyTargetClass} flag is set
+ * <li>the "optimize" flag is set
+ * <li>the "proxyTargetClass" flag is set
  * <li>no proxy interfaces have been specified
  * </ul>
  *
- * <p>In general, specify {@code proxyTargetClass} to enforce a CGLIB proxy,
+ * <p>Note that the CGLIB library classes have to be present on
+ * the class path if an actual CGLIB proxy needs to be created.
+ *
+ * <p>In general, specify "proxyTargetClass" to enforce a CGLIB proxy,
  * or specify one or more interfaces to use a JDK dynamic proxy.
  *
  * @author Rod Johnson
@@ -54,7 +56,7 @@ public class DefaultAopProxyFactory implements AopProxyFactory, Serializable {
 				throw new AopConfigException("TargetSource cannot determine target class: " +
 						"Either an interface or a target is required for proxy creation.");
 			}
-			if (targetClass.isInterface() || Proxy.isProxyClass(targetClass)) {
+			if (targetClass.isInterface()) {
 				return new JdkDynamicAopProxy(config);
 			}
 			return new ObjenesisCglibAopProxy(config);
@@ -70,8 +72,7 @@ public class DefaultAopProxyFactory implements AopProxyFactory, Serializable {
 	 * (or no proxy interfaces specified at all).
 	 */
 	private boolean hasNoUserSuppliedProxyInterfaces(AdvisedSupport config) {
-		Class<?>[] ifcs = config.getProxiedInterfaces();
-		return (ifcs.length == 0 || (ifcs.length == 1 && SpringProxy.class.isAssignableFrom(ifcs[0])));
+		Class<?>[] interfaces = config.getProxiedInterfaces();
+		return (interfaces.length == 0 || (interfaces.length == 1 && SpringProxy.class.equals(interfaces[0])));
 	}
-
 }

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2015 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.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -22,14 +22,14 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.cglib.proxy.Callback;
 import org.springframework.cglib.proxy.Enhancer;
 import org.springframework.cglib.proxy.Factory;
-import org.springframework.objenesis.SpringObjenesis;
+import org.springframework.objenesis.ObjenesisException;
+import org.springframework.objenesis.ObjenesisStd;
 
 /**
- * Objenesis-based extension of {@link CglibAopProxy} to create proxy instances
- * without invoking the constructor of the class.
+ * Objenesis based extension of {@link CglibAopProxy} to create proxy instances without
+ * invoking the constructor of the class.
  *
  * @author Oliver Gierke
- * @author Juergen Hoeller
  * @since 4.0
  */
 @SuppressWarnings("serial")
@@ -37,49 +37,34 @@ class ObjenesisCglibAopProxy extends CglibAopProxy {
 
 	private static final Log logger = LogFactory.getLog(ObjenesisCglibAopProxy.class);
 
-	private static final SpringObjenesis objenesis = new SpringObjenesis();
+	private final ObjenesisStd objenesis;
 
 
 	/**
-	 * Create a new ObjenesisCglibAopProxy for the given AOP configuration.
-	 * @param config the AOP configuration as AdvisedSupport object
+	 * Creates a new {@link ObjenesisCglibAopProxy} using the given {@link AdvisedSupport}.
+	 * @param config must not be {@literal null}.
 	 */
 	public ObjenesisCglibAopProxy(AdvisedSupport config) {
 		super(config);
+		this.objenesis = new ObjenesisStd(true);
 	}
 
 
 	@Override
 	@SuppressWarnings("unchecked")
 	protected Object createProxyClassAndInstance(Enhancer enhancer, Callback[] callbacks) {
-		Class<?> proxyClass = enhancer.createClass();
-		Object proxyInstance = null;
-
-		if (objenesis.isWorthTrying()) {
-			try {
-				proxyInstance = objenesis.newInstance(proxyClass, enhancer.getUseCache());
-			}
-			catch (Throwable ex) {
-				logger.debug("Unable to instantiate proxy using Objenesis, " +
-						"falling back to regular proxy construction", ex);
-			}
+		try {
+			Factory factory = (Factory) this.objenesis.newInstance(enhancer.createClass());
+			factory.setCallbacks(callbacks);
+			return factory;
 		}
-
-		if (proxyInstance == null) {
-			// Regular instantiation via default constructor...
-			try {
-				proxyInstance = (this.constructorArgs != null ?
-						proxyClass.getConstructor(this.constructorArgTypes).newInstance(this.constructorArgs) :
-						proxyClass.newInstance());
-			}
-			catch (Throwable ex) {
-				throw new AopConfigException("Unable to instantiate proxy using Objenesis, " +
-						"and regular proxy instantiation via default constructor fails as well", ex);
+		catch (ObjenesisException ex) {
+			// Fallback to regular proxy construction on unsupported JVMs
+			if (logger.isDebugEnabled()) {
+				logger.debug("Unable to instantiate proxy using Objenesis, falling back to regular proxy construction", ex);
 			}
+			return super.createProxyClassAndInstance(enhancer, callbacks);
 		}
-
-		((Factory) proxyInstance).setCallbacks(callbacks);
-		return proxyInstance;
 	}
 
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -44,7 +44,7 @@ import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.FactoryBeanNotInitializedException;
 import org.springframework.beans.factory.ListableBeanFactory;
-import org.springframework.core.annotation.AnnotationAwareOrderComparator;
+import org.springframework.core.OrderComparator;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
 
@@ -414,7 +414,7 @@ public class ProxyFactoryBean extends ProxyCreatorSupport
 	}
 
 	/**
-	 * Create the advisor (interceptor) chain. Advisors that are sourced
+	 * Create the advisor (interceptor) chain. Aadvisors that are sourced
 	 * from a BeanFactory will be refreshed each time a new prototype instance
 	 * is added. Interceptors added programmatically through the factory API
 	 * are unaffected by such changes.
@@ -525,7 +525,7 @@ public class ProxyFactoryBean extends ProxyCreatorSupport
 			beans.add(bean);
 			names.put(bean, name);
 		}
-		AnnotationAwareOrderComparator.sort(beans);
+		OrderComparator.sort(beans);
 		for (Object bean : beans) {
 			String name = names.get(bean);
 			if (name.startsWith(prefix)) {

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

@@ -1,145 +0,0 @@
-/*
- * Copyright 2002-2014 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.aop.framework;
-
-import org.springframework.beans.factory.Aware;
-import org.springframework.beans.factory.BeanClassLoaderAware;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.core.Ordered;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.ObjectUtils;
-
-/**
- * Base class with common functionality for proxy processors, in particular
- * ClassLoader management and the {@link #evaluateProxyInterfaces} algorithm.
- *
- * @author Juergen Hoeller
- * @since 4.1
- * @see AbstractAdvisingBeanPostProcessor
- * @see org.springframework.aop.framework.autoproxy.AbstractAutoProxyCreator
- */
-@SuppressWarnings("serial")
-public class ProxyProcessorSupport extends ProxyConfig implements Ordered, BeanClassLoaderAware, AopInfrastructureBean {
-
-	/**
-	 * This should run after all other processors, so that it can just add
-	 * an advisor to existing proxies rather than double-proxy.
-	 */
-	private int order = Ordered.LOWEST_PRECEDENCE;
-
-	private ClassLoader proxyClassLoader = ClassUtils.getDefaultClassLoader();
-
-	private boolean classLoaderConfigured = false;
-
-
-	/**
-	 * Set the ordering which will apply to this class's implementation
-	 * of Ordered, used when applying multiple processors.
-	 * <p>Default value is {@code Integer.MAX_VALUE}, meaning that it's non-ordered.
-	 * @param order the ordering value
-	 */
-	public void setOrder(int order) {
-		this.order = order;
-	}
-
-	@Override
-	public int getOrder() {
-		return this.order;
-	}
-
-	/**
-	 * Set the ClassLoader to generate the proxy class in.
-	 * <p>Default is the bean ClassLoader, i.e. the ClassLoader used by the containing
-	 * {@link org.springframework.beans.factory.BeanFactory} for loading all bean classes.
-	 * This can be overridden here for specific proxies.
-	 */
-	public void setProxyClassLoader(ClassLoader classLoader) {
-		this.proxyClassLoader = classLoader;
-		this.classLoaderConfigured = (classLoader != null);
-	}
-
-	/**
-	 * Return the configured proxy ClassLoader for this processor.
-	 */
-	protected ClassLoader getProxyClassLoader() {
-		return this.proxyClassLoader;
-	}
-
-	@Override
-	public void setBeanClassLoader(ClassLoader classLoader) {
-		if (!this.classLoaderConfigured) {
-			this.proxyClassLoader = classLoader;
-		}
-	}
-
-
-	/**
-	 * Check the interfaces on the given bean class and apply them to the {@link ProxyFactory},
-	 * if appropriate.
-	 * <p>Calls {@link #isConfigurationCallbackInterface} and {@link #isInternalLanguageInterface}
-	 * to filter for reasonable proxy interfaces, falling back to a target-class proxy otherwise.
-	 * @param beanClass the class of the bean
-	 * @param proxyFactory the ProxyFactory for the bean
-	 */
-	protected void evaluateProxyInterfaces(Class<?> beanClass, ProxyFactory proxyFactory) {
-		Class<?>[] targetInterfaces = ClassUtils.getAllInterfacesForClass(beanClass, getProxyClassLoader());
-		boolean hasReasonableProxyInterface = false;
-		for (Class<?> ifc : targetInterfaces) {
-			if (!isConfigurationCallbackInterface(ifc) && !isInternalLanguageInterface(ifc) &&
-					ifc.getMethods().length > 0) {
-				hasReasonableProxyInterface = true;
-				break;
-			}
-		}
-		if (hasReasonableProxyInterface) {
-			// Must allow for introductions; can't just set interfaces to the target's interfaces only.
-			for (Class<?> ifc : targetInterfaces) {
-				proxyFactory.addInterface(ifc);
-			}
-		}
-		else {
-			proxyFactory.setProxyTargetClass(true);
-		}
-	}
-
-	/**
-	 * Determine whether the given interface is just a container callback and
-	 * therefore not to be considered as a reasonable proxy interface.
-	 * <p>If no reasonable proxy interface is found for a given bean, it will get
-	 * proxied with its full target class, assuming that as the user's intention.
-	 * @param ifc the interface to check
-	 * @return whether the given interface is just a container callback
-	 */
-	protected boolean isConfigurationCallbackInterface(Class<?> ifc) {
-		return (InitializingBean.class == ifc || DisposableBean.class == ifc ||
-				ObjectUtils.containsElement(ifc.getInterfaces(), Aware.class));
-	}
-
-	/**
-	 * Determine whether the given interface is a well-known internal language interface
-	 * and therefore not to be considered as a reasonable proxy interface.
-	 * <p>If no reasonable proxy interface is found for a given bean, it will get
-	 * proxied with its full target class, assuming that as the user's intention.
-	 * @param ifc the interface to check
-	 * @return whether the given interface is an internal language interface
-	 */
-	protected boolean isInternalLanguageInterface(Class<?> ifc) {
-		return ifc.getName().equals("groovy.lang.GroovyObject");
-	}
-
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 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.
@@ -109,7 +109,7 @@ public class ThrowsAdviceInterceptor implements MethodInterceptor, AfterAdvice {
 			logger.trace("Trying to find handler for exception of type [" + exceptionClass.getName() + "]");
 		}
 		Method handler = this.exceptionHandlerMap.get(exceptionClass);
-		while (handler == null && exceptionClass != Throwable.class) {
+		while (handler == null && !exceptionClass.equals(Throwable.class)) {
 			exceptionClass = exceptionClass.getSuperclass();
 			handler = this.exceptionHandlerMap.get(exceptionClass);
 		}

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

@@ -1,12 +1,18 @@
+
 /**
+ *
  * SPI package allowing Spring AOP framework to handle arbitrary advice types.
- *
- * <p>Users who want merely to <i>use</i> the Spring AOP framework, rather than extend
+ * <br>
+ * Users who want merely to <i>use</i> the Spring AOP framework, rather than extend
  * its capabilities, don't need to concern themselves with this package.
+ * <br>
+ * 	You may wish to use these adapters to wrap Spring-specific advices, such as MethodBeforeAdvice,
+ * 	in MethodInterceptor, to allow their use in another AOP framework supporting the AOP Alliance interfaces.
+ * </br>
+ * <br>
+ * 	These adapters do not depend on any other Spring framework classes to allow such usage.
+ * </br>
  *
- * <p>You may wish to use these adapters to wrap Spring-specific advices, such as MethodBeforeAdvice,
- * in MethodInterceptor, to allow their use in another AOP framework supporting the AOP Alliance interfaces.
- *
- * <p>These adapters do not depend on any other Spring framework classes to allow such usage.
  */
 package org.springframework.aop.framework.adapter;
+

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 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,7 @@ import org.springframework.aop.TargetSource;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.core.annotation.AnnotationAwareOrderComparator;
+import org.springframework.core.OrderComparator;
 
 /**
  * Generic auto proxy creator that builds AOP proxies for specific beans
@@ -138,11 +138,10 @@ public abstract class AbstractAdvisorAutoProxyCreator extends AbstractAutoProxyC
 	 * @param advisors the source List of Advisors
 	 * @return the sorted List of Advisors
 	 * @see org.springframework.core.Ordered
-	 * @see org.springframework.core.annotation.Order
-	 * @see org.springframework.core.annotation.AnnotationAwareOrderComparator
+	 * @see org.springframework.core.OrderComparator
 	 */
 	protected List<Advisor> sortAdvisors(List<Advisor> advisors) {
-		AnnotationAwareOrderComparator.sort(advisors);
+		OrderComparator.sort(advisors);
 		return advisors;
 	}
 

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

@@ -33,18 +33,25 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.aop.Advisor;
 import org.springframework.aop.TargetSource;
 import org.springframework.aop.framework.AopInfrastructureBean;
+import org.springframework.aop.framework.ProxyConfig;
 import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.aop.framework.ProxyProcessorSupport;
 import org.springframework.aop.framework.adapter.AdvisorAdapterRegistry;
 import org.springframework.aop.framework.adapter.GlobalAdvisorAdapterRegistry;
 import org.springframework.aop.target.SingletonTargetSource;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.PropertyValues;
+import org.springframework.beans.factory.Aware;
+import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor;
+import org.springframework.core.Ordered;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.ObjectUtils;
 
 /**
  * {@link org.springframework.beans.factory.config.BeanPostProcessor} implementation
@@ -87,8 +94,9 @@ import org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostP
  * @see DefaultAdvisorAutoProxyCreator
  */
 @SuppressWarnings("serial")
-public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport
-		implements SmartInstantiationAwareBeanPostProcessor, BeanFactoryAware {
+public abstract class AbstractAutoProxyCreator extends ProxyConfig
+		implements SmartInstantiationAwareBeanPostProcessor, BeanClassLoaderAware, BeanFactoryAware,
+		Ordered, AopInfrastructureBean {
 
 	/**
 	 * Convenience constant for subclasses: Return value for "do not proxy".
@@ -107,6 +115,9 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport
 	/** Logger available to subclasses */
 	protected final Log logger = LogFactory.getLog(getClass());
 
+	/** Default value is same as non-ordered */
+	private int order = Ordered.LOWEST_PRECEDENCE;
+
 	/** Default is global AdvisorAdapterRegistry */
 	private AdvisorAdapterRegistry advisorAdapterRegistry = GlobalAdvisorAdapterRegistry.getInstance();
 
@@ -123,6 +134,10 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport
 
 	private TargetSourceCreator[] customTargetSourceCreators;
 
+	private ClassLoader proxyClassLoader = ClassUtils.getDefaultClassLoader();
+
+	private boolean classLoaderConfigured = false;
+
 	private BeanFactory beanFactory;
 
 	private final Map<Object, Boolean> advisedBeans = new ConcurrentHashMap<Object, Boolean>(64);
@@ -136,6 +151,21 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport
 	private final Map<Object, Class<?>> proxyTypes = new ConcurrentHashMap<Object, Class<?>>(16);
 
 
+	/**
+	 * Set the ordering which will apply to this class's implementation
+	 * of Ordered, used when applying multiple BeanPostProcessors.
+	 * <p>Default value is {@code Integer.MAX_VALUE}, meaning that it's non-ordered.
+	 * @param order ordering value
+	 */
+	public final void setOrder(int order) {
+		this.order = order;
+	}
+
+	@Override
+	public final int getOrder() {
+		return this.order;
+	}
+
 	/**
 	 * Set whether or not the proxy should be frozen, preventing advice
 	 * from being added to it once it is created.
@@ -198,6 +228,24 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport
 		this.applyCommonInterceptorsFirst = applyCommonInterceptorsFirst;
 	}
 
+	/**
+	 * Set the ClassLoader to generate the proxy class in.
+	 * <p>Default is the bean ClassLoader, i.e. the ClassLoader used by the
+	 * containing BeanFactory for loading all bean classes. This can be
+	 * overridden here for specific proxies.
+	 */
+	public void setProxyClassLoader(ClassLoader classLoader) {
+		this.proxyClassLoader = classLoader;
+		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;
@@ -420,6 +468,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport
 			Class<?> beanClass, String beanName, Object[] specificInterceptors, TargetSource targetSource) {
 
 		ProxyFactory proxyFactory = new ProxyFactory();
+		// Copy our properties (proxyTargetClass etc) inherited from ProxyConfig.
 		proxyFactory.copyFrom(this);
 
 		if (!proxyFactory.isProxyTargetClass()) {
@@ -444,7 +493,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport
 			proxyFactory.setPreFiltered(true);
 		}
 
-		return proxyFactory.getProxy(getProxyClassLoader());
+		return proxyFactory.getProxy(this.proxyClassLoader);
 	}
 
 	/**
@@ -461,6 +510,47 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport
 				AutoProxyUtils.shouldProxyTargetClass((ConfigurableListableBeanFactory) this.beanFactory, beanName));
 	}
 
+	/**
+	 * Check the interfaces on the given bean class and apply them to the ProxyFactory,
+	 * if appropriate.
+	 * <p>Calls {@link #isConfigurationCallbackInterface} to filter for reasonable
+	 * proxy interfaces, falling back to a target-class proxy otherwise.
+	 * @param beanClass the class of the bean
+	 * @param proxyFactory the ProxyFactory for the bean
+	 */
+	private void evaluateProxyInterfaces(Class<?> beanClass, ProxyFactory proxyFactory) {
+		Class<?>[] targetInterfaces = ClassUtils.getAllInterfacesForClass(beanClass, this.proxyClassLoader);
+		boolean hasReasonableProxyInterface = false;
+		for (Class<?> ifc : targetInterfaces) {
+			if (!isConfigurationCallbackInterface(ifc) && ifc.getMethods().length > 0) {
+				hasReasonableProxyInterface = true;
+				break;
+			}
+		}
+		if (hasReasonableProxyInterface) {
+			// Must allow for introductions; can't just set interfaces to the target's interfaces only.
+			for (Class<?> ifc : targetInterfaces) {
+				proxyFactory.addInterface(ifc);
+			}
+		}
+		else {
+			proxyFactory.setProxyTargetClass(true);
+		}
+	}
+
+	/**
+	 * Determine whether the given interface is just a container callback and
+	 * therefore not to be considered as a reasonable proxy interface.
+	 * <p>If no reasonable proxy interface is found for a given bean, it will get
+	 * proxied with its full target class, assuming that as the user's intention.
+	 * @param ifc the interface to check
+	 * @return whether the given interface is just a container callback
+	 */
+	protected boolean isConfigurationCallbackInterface(Class<?> ifc) {
+		return (ifc.equals(InitializingBean.class) || ifc.equals(DisposableBean.class) ||
+				ObjectUtils.containsElement(ifc.getInterfaces(), Aware.class));
+	}
+
 	/**
 	 * Return whether the Advisors returned by the subclass are pre-filtered
 	 * to match the bean's target class already, allowing the ClassFilter check

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

@@ -1,4 +1,6 @@
+
 /**
+ *
  * Bean post-processors for use in ApplicationContexts to simplify AOP usage
  * by automatically creating AOP proxies without the need to use a ProxyFactoryBean.
  *
@@ -8,5 +10,7 @@
  * <p><b>NB</b>: Automatic auto-proxying is not supported for BeanFactory implementations,
  * as post-processors beans are only automatically detected in application contexts.
  * Post-processors can be explicitly registered on a ConfigurableBeanFactory instead.
+ *
  */
 package org.springframework.aop.framework.autoproxy;
+

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 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.
@@ -17,20 +17,19 @@
 package org.springframework.aop.framework.autoproxy.target;
 
 import org.springframework.aop.target.AbstractBeanFactoryBasedTargetSource;
-import org.springframework.aop.target.CommonsPool2TargetSource;
+import org.springframework.aop.target.CommonsPoolTargetSource;
 import org.springframework.aop.target.PrototypeTargetSource;
 import org.springframework.aop.target.ThreadLocalTargetSource;
 
 /**
  * Convenient TargetSourceCreator using bean name prefixes to create one of three
  * well-known TargetSource types:
- * <li>: CommonsPool2TargetSource
+ * <li>: CommonsPoolTargetSource
  * <li>% ThreadLocalTargetSource
  * <li>! PrototypeTargetSource
  *
  * @author Rod Johnson
- * @author Stephane Nicoll
- * @see org.springframework.aop.target.CommonsPool2TargetSource
+ * @see org.springframework.aop.target.CommonsPoolTargetSource
  * @see org.springframework.aop.target.ThreadLocalTargetSource
  * @see org.springframework.aop.target.PrototypeTargetSource
  */
@@ -45,7 +44,7 @@ public class QuickTargetSourceCreator extends AbstractBeanFactoryBasedTargetSour
 			Class<?> beanClass, String beanName) {
 
 		if (beanName.startsWith(PREFIX_COMMONS_POOL)) {
-			CommonsPool2TargetSource cpts = new CommonsPool2TargetSource();
+			CommonsPoolTargetSource cpts = new CommonsPoolTargetSource();
 			cpts.setMaxSize(25);
 			return cpts;
 		}

spring-aop/src/main/java/org/springframework/aop/framework/package-info.java

@@ -1,4 +1,6 @@
+
 /**
+ *
  * Package containing Spring's basic AOP infrastructure, compliant with the
  * <a href="http://aopalliance.sourceforge.net">AOP Alliance</a> interfaces.
  *
@@ -11,5 +13,7 @@
  * <p>The ProxyFactoryBean is a convenient way to create AOP proxies in a BeanFactory
  * or ApplicationContext. However, proxies can be created programmatically using the
  * ProxyFactory class.
+ *
  */
 package org.springframework.aop.framework;
+

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2014 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,32 +18,20 @@ package org.springframework.aop.interceptor;
 
 import java.lang.reflect.Method;
 import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executor;
-import java.util.concurrent.Future;
-import java.util.function.Supplier;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.annotation.BeanFactoryAnnotationUtils;
-import org.springframework.core.task.AsyncListenableTaskExecutor;
 import org.springframework.core.task.AsyncTaskExecutor;
 import org.springframework.core.task.support.TaskExecutorAdapter;
-import org.springframework.lang.UsesJava8;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.ReflectionUtils;
+import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
-import org.springframework.util.concurrent.ListenableFuture;
 
 /**
  * Base class for asynchronous method execution aspects, such as
- * {@code org.springframework.scheduling.annotation.AnnotationAsyncExecutionInterceptor}
+ * {@link org.springframework.scheduling.annotation.AnnotationAsyncExecutionInterceptor}
  * or {@code org.springframework.scheduling.aspectj.AnnotationAsyncExecutionAspect}.
  *
  * <p>Provides support for <i>executor qualification</i> on a method-by-method basis.
@@ -52,25 +40,14 @@ import org.springframework.util.concurrent.ListenableFuture;
  * bean to be used when executing it, e.g. through an annotation attribute.
  *
  * @author Chris Beams
- * @author Juergen Hoeller
- * @author Stephane Nicoll
  * @since 3.1.2
  */
 public abstract class AsyncExecutionAspectSupport implements BeanFactoryAware {
 
-	// Java 8's CompletableFuture type present?
-	private static final boolean completableFuturePresent = ClassUtils.isPresent(
-			"java.util.concurrent.CompletableFuture", AsyncExecutionInterceptor.class.getClassLoader());
-
-
-	protected final Log logger = LogFactory.getLog(getClass());
-
 	private final Map<Method, AsyncTaskExecutor> executors = new ConcurrentHashMap<Method, AsyncTaskExecutor>(16);
 
 	private Executor defaultExecutor;
 
-	private AsyncUncaughtExceptionHandler exceptionHandler;
-
 	private BeanFactory beanFactory;
 
 
@@ -79,18 +56,9 @@ public abstract class AsyncExecutionAspectSupport implements BeanFactoryAware {
 	 * executor unless individual async methods indicate via qualifier that a more
 	 * specific executor should be used.
 	 * @param defaultExecutor the executor to use when executing asynchronous methods
-	 * @param exceptionHandler the {@link AsyncUncaughtExceptionHandler} to use
-	 */
-	public AsyncExecutionAspectSupport(Executor defaultExecutor, AsyncUncaughtExceptionHandler exceptionHandler) {
-		this.defaultExecutor = defaultExecutor;
-		this.exceptionHandler = exceptionHandler;
-	}
-
-	/**
-	 * Create a new instance with a default {@link AsyncUncaughtExceptionHandler}.
 	 */
 	public AsyncExecutionAspectSupport(Executor defaultExecutor) {
-		this(defaultExecutor, new SimpleAsyncUncaughtExceptionHandler());
+		this.defaultExecutor = defaultExecutor;
 	}
 
 
@@ -108,14 +76,6 @@ public abstract class AsyncExecutionAspectSupport implements BeanFactoryAware {
 		this.defaultExecutor = defaultExecutor;
 	}
 
-	/**
-	 * Supply the {@link AsyncUncaughtExceptionHandler} to use to handle exceptions
-	 * thrown by invoking asynchronous methods with a {@code void} return type.
-	 */
-	public void setExceptionHandler(AsyncUncaughtExceptionHandler exceptionHandler) {
-		this.exceptionHandler = exceptionHandler;
-	}
-
 	/**
 	 * Set the {@link BeanFactory} to be used when looking up executors by qualifier.
 	 */
@@ -127,7 +87,6 @@ public abstract class AsyncExecutionAspectSupport implements BeanFactoryAware {
 
 	/**
 	 * Determine the specific executor to use when executing the given method.
-	 * Should preferably return an {@link AsyncListenableTaskExecutor} implementation.
 	 * @return the executor to use (or {@code null}, but just if no default executor has been set)
 	 */
 	protected AsyncTaskExecutor determineAsyncExecutor(Method method) {
@@ -136,18 +95,16 @@ public abstract class AsyncExecutionAspectSupport implements BeanFactoryAware {
 			Executor executorToUse = this.defaultExecutor;
 			String qualifier = getExecutorQualifier(method);
 			if (StringUtils.hasLength(qualifier)) {
-				if (this.beanFactory == null) {
-					throw new IllegalStateException("BeanFactory must be set on " + getClass().getSimpleName() +
-							" to access qualified executor '" + qualifier + "'");
-				}
+				Assert.notNull(this.beanFactory, "BeanFactory must be set on " + getClass().getSimpleName() +
+						" to access qualified executor '" + qualifier + "'");
 				executorToUse = BeanFactoryAnnotationUtils.qualifiedBeanOfType(
 						this.beanFactory, Executor.class, qualifier);
 			}
 			else if (executorToUse == null) {
 				return null;
 			}
-			executor = (executorToUse instanceof AsyncListenableTaskExecutor ?
-					(AsyncListenableTaskExecutor) executorToUse : new TaskExecutorAdapter(executorToUse));
+			executor = (executorToUse instanceof AsyncTaskExecutor ?
+					(AsyncTaskExecutor) executorToUse : new TaskExecutorAdapter(executorToUse));
 			this.executors.put(method, executor);
 		}
 		return executor;
@@ -165,83 +122,4 @@ public abstract class AsyncExecutionAspectSupport implements BeanFactoryAware {
 	 */
 	protected abstract String getExecutorQualifier(Method method);
 
-	/**
-	 * Delegate for actually executing the given task with the chosen executor.
-	 * @param task the task to execute
-	 * @param executor the chosen executor
-	 * @param returnType the declared return type (potentially a {@link Future} variant)
-	 * @return the execution result (potentially a corresponding {@link Future} handle)
-	 */
-	protected Object doSubmit(Callable<Object> task, AsyncTaskExecutor executor, Class<?> returnType) {
-		if (completableFuturePresent) {
-			Future<Object> result = CompletableFutureDelegate.processCompletableFuture(returnType, task, executor);
-			if (result != null) {
-				return result;
-			}
-		}
-		if (ListenableFuture.class.isAssignableFrom(returnType)) {
-			return ((AsyncListenableTaskExecutor) executor).submitListenable(task);
-		}
-		else if (Future.class.isAssignableFrom(returnType)) {
-			return executor.submit(task);
-		}
-		else {
-			executor.submit(task);
-			return null;
-		}
-	}
-
-	/**
-	 * Handles a fatal error thrown while asynchronously invoking the specified
-	 * {@link Method}.
-	 * <p>If the return type of the method is a {@link Future} object, the original
-	 * exception can be propagated by just throwing it at the higher level. However,
-	 * for all other cases, the exception will not be transmitted back to the client.
-	 * In that later case, the current {@link AsyncUncaughtExceptionHandler} will be
-	 * used to manage such exception.
-	 * @param ex the exception to handle
-	 * @param method the method that was invoked
-	 * @param params the parameters used to invoke the method
-	 */
-	protected void handleError(Throwable ex, Method method, Object... params) throws Exception {
-		if (Future.class.isAssignableFrom(method.getReturnType())) {
-			ReflectionUtils.rethrowException(ex);
-		}
-		else {
-			// Could not transmit the exception to the caller with default executor
-			try {
-				this.exceptionHandler.handleUncaughtException(ex, method, params);
-			}
-			catch (Throwable ex2) {
-				logger.error("Exception handler for async method '" + method.toGenericString() +
-						"' threw unexpected exception itself", ex2);
-			}
-		}
-	}
-
-
-	/**
-	 * Inner class to avoid a hard dependency on Java 8.
-	 */
-	@UsesJava8
-	private static class CompletableFutureDelegate {
-
-		public static <T> Future<T> processCompletableFuture(Class<?> returnType, final Callable<T> task, Executor executor) {
-			if (!CompletableFuture.class.isAssignableFrom(returnType)) {
-				return null;
-			}
-			return CompletableFuture.supplyAsync(new Supplier<T>() {
-				@Override
-				public T get() {
-					try {
-						return task.call();
-					}
-					catch (Throwable ex) {
-						throw new CompletionException(ex);
-					}
-				}
-			}, executor);
-		}
-	}
-
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2014 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,7 +18,6 @@ package org.springframework.aop.interceptor;
 
 import java.lang.reflect.Method;
 import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Future;
 
@@ -30,6 +29,7 @@ import org.springframework.core.BridgeMethodResolver;
 import org.springframework.core.Ordered;
 import org.springframework.core.task.AsyncTaskExecutor;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.ReflectionUtils;
 
 /**
  * AOP Alliance {@code MethodInterceptor} that processes method invocations
@@ -46,42 +46,30 @@ import org.springframework.util.ClassUtils;
  * (like Spring's {@link org.springframework.scheduling.annotation.AsyncResult}
  * or EJB 3.1's {@code javax.ejb.AsyncResult}).
  *
- * <p>When the return type is {@code java.util.concurrent.Future}, any exception thrown
- * during the execution can be accessed and managed by the caller. With {@code void}
- * return type however, such exceptions cannot be transmitted back. In that case an
- * {@link AsyncUncaughtExceptionHandler} can be registered to process such exceptions.
- *
  * <p>As of Spring 3.1.2 the {@code AnnotationAsyncExecutionInterceptor} subclass is
  * preferred for use due to its support for executor qualification in conjunction with
  * Spring's {@code @Async} annotation.
  *
  * @author Juergen Hoeller
  * @author Chris Beams
- * @author Stephane Nicoll
  * @since 3.0
  * @see org.springframework.scheduling.annotation.Async
  * @see org.springframework.scheduling.annotation.AsyncAnnotationAdvisor
  * @see org.springframework.scheduling.annotation.AnnotationAsyncExecutionInterceptor
  */
-public class AsyncExecutionInterceptor extends AsyncExecutionAspectSupport implements MethodInterceptor, Ordered {
+public class AsyncExecutionInterceptor extends AsyncExecutionAspectSupport
+		implements MethodInterceptor, Ordered {
 
 	/**
 	 * 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 exceptionHandler the {@link AsyncUncaughtExceptionHandler} to use
-	 */
-	public AsyncExecutionInterceptor(Executor defaultExecutor, AsyncUncaughtExceptionHandler exceptionHandler) {
-		super(defaultExecutor, exceptionHandler);
-	}
-
-	/**
-	 * Create a new instance with a default {@link AsyncUncaughtExceptionHandler}.
 	 */
 	public AsyncExecutionInterceptor(Executor defaultExecutor) {
 		super(defaultExecutor);
 	}
 
+
 	/**
 	 * Intercept the given method invocation, submit the actual calling of the method to
 	 * the correct task executor and return immediately to the caller.
@@ -93,34 +81,37 @@ public class AsyncExecutionInterceptor extends AsyncExecutionAspectSupport imple
 	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);
-		final Method userDeclaredMethod = BridgeMethodResolver.findBridgedMethod(specificMethod);
+		specificMethod = BridgeMethodResolver.findBridgedMethod(specificMethod);
 
-		AsyncTaskExecutor executor = determineAsyncExecutor(userDeclaredMethod);
+		AsyncTaskExecutor executor = determineAsyncExecutor(specificMethod);
 		if (executor == null) {
 			throw new IllegalStateException(
 					"No executor specified and no default executor set on AsyncExecutionInterceptor either");
 		}
 
-		Callable<Object> task = new Callable<Object>() {
-			@Override
-			public Object call() throws Exception {
-				try {
-					Object result = invocation.proceed();
-					if (result instanceof Future) {
-						return ((Future<?>) result).get();
+		Future<?> result = executor.submit(
+				new Callable<Object>() {
+					@Override
+					public Object call() throws Exception {
+						try {
+							Object result = invocation.proceed();
+							if (result instanceof Future) {
+								return ((Future<?>) result).get();
+							}
+						}
+						catch (Throwable ex) {
+							ReflectionUtils.rethrowException(ex);
+						}
+						return null;
 					}
-				}
-				catch (ExecutionException ex) {
-					handleError(ex.getCause(), userDeclaredMethod, invocation.getArguments());
-				}
-				catch (Throwable ex) {
-					handleError(ex, userDeclaredMethod, invocation.getArguments());
-				}
-				return null;
-			}
-		};
+				});
 
-		return doSubmit(task, executor, invocation.getMethod().getReturnType());
+		if (Future.class.isAssignableFrom(invocation.getMethod().getReturnType())) {
+			return result;
+		}
+		else {
+			return null;
+		}
 	}
 
 	/**

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

@@ -1,42 +0,0 @@
-/*
- * Copyright 2002-2014 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.aop.interceptor;
-
-import java.lang.reflect.Method;
-
-/**
- * A strategy for handling uncaught exceptions thrown from asynchronous methods.
- *
- * <p>An asynchronous method usually returns a {@link java.util.concurrent.Future}
- * instance that gives access to the underlying exception. When the method does
- * not provide that return type, this handler can be used to managed such
- * uncaught exceptions.
- *
- * @author Stephane Nicoll
- * @since 4.1
- */
-public interface AsyncUncaughtExceptionHandler {
-
-	/**
-	 * Handle the given uncaught exception thrown from an asynchronous method.
-	 * @param ex the exception thrown from the asynchronous method
-	 * @param method the asynchronous method
-	 * @param params the parameters used to invoked the method
-	 */
-	void handleUncaughtException(Throwable ex, Method method, Object... params);
-
-}

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

@@ -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.
@@ -24,7 +24,7 @@ import org.aopalliance.intercept.MethodInvocation;
 import org.springframework.aop.Advisor;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
 import org.springframework.core.NamedThreadLocal;
-import org.springframework.core.PriorityOrdered;
+import org.springframework.core.Ordered;
 
 /**
  * Interceptor that exposes the current {@link org.aopalliance.intercept.MethodInvocation}
@@ -41,7 +41,7 @@ import org.springframework.core.PriorityOrdered;
  * @author Juergen Hoeller
  */
 @SuppressWarnings("serial")
-public class ExposeInvocationInterceptor implements MethodInterceptor, PriorityOrdered, Serializable {
+public class ExposeInvocationInterceptor implements MethodInterceptor, Ordered, Serializable {
 
 	/** Singleton instance of this class */
 	public static final ExposeInvocationInterceptor INSTANCE = new ExposeInvocationInterceptor();
@@ -98,7 +98,7 @@ public class ExposeInvocationInterceptor implements MethodInterceptor, PriorityO
 
 	@Override
 	public int getOrder() {
-		return PriorityOrdered.HIGHEST_PRECEDENCE + 1;
+		return Ordered.HIGHEST_PRECEDENCE + 1;
 	}
 
 	/**

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

@@ -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.
@@ -16,26 +16,21 @@
 
 package org.springframework.aop.interceptor;
 
-import com.jamonapi.MonKey;
-import com.jamonapi.MonKeyImp;
 import com.jamonapi.Monitor;
 import com.jamonapi.MonitorFactory;
-import com.jamonapi.utils.Misc;
 import org.aopalliance.intercept.MethodInvocation;
 import org.apache.commons.logging.Log;
 
 /**
- * Performance monitor interceptor that uses <b>JAMon</b> library to perform the
- * performance measurement on the intercepted method and output the stats.
- * In addition, it tracks/counts exceptions thrown by the intercepted method.
- * The stack traces can be viewed in the JAMon web application.
+ * Performance monitor interceptor that uses <b>JAMon</b> library
+ * to perform the performance measurement on the intercepted method
+ * and output the stats.
  *
  * <p>This code is inspired by Thierry Templier's blog.
  *
  * @author Dmitriy Kopylenko
  * @author Juergen Hoeller
  * @author Rob Harrop
- * @author Steve Souza
  * @since 1.1.3
  * @see com.jamonapi.MonitorFactory
  * @see PerformanceMonitorInterceptor
@@ -108,16 +103,10 @@ public class JamonPerformanceMonitorInterceptor extends AbstractMonitoringInterc
 	@Override
 	protected Object invokeUnderTrace(MethodInvocation invocation, Log logger) throws Throwable {
 		String name = createInvocationTraceName(invocation);
-		MonKey key = new MonKeyImp(name, name, "ms.");
-
-		Monitor monitor = MonitorFactory.start(key);
+		Monitor monitor = MonitorFactory.start(name);
 		try {
 			return invocation.proceed();
 		}
-		catch (Throwable ex) {
-			trackException(key, ex);
-			throw ex;
-		}
 		finally {
 			monitor.stop();
 			if (!this.trackAllInvocations || isLogEnabled(logger)) {
@@ -126,19 +115,4 @@ public class JamonPerformanceMonitorInterceptor extends AbstractMonitoringInterc
 		}
 	}
 
-	/**
-	 * Count the thrown exception and put the stack trace in the details portion of the key.
-	 * This will allow the stack trace to be viewed in the JAMon web application.
-	 */
-	protected void trackException(MonKey key, Throwable ex) {
-		String stackTrace = "stackTrace=" + Misc.getExceptionTrace(ex);
-		key.setDetails(stackTrace);
-
-		// Specific exception counter. Example: java.lang.RuntimeException
-		MonitorFactory.add(new MonKeyImp(ex.getClass().getName(), stackTrace, "Exception"), 1);
-
-		// General exception counter which is a total for all exceptions thrown
-		MonitorFactory.add(new MonKeyImp(MonitorFactory.EXCEPTIONS_LABEL, stackTrace, "Exception"), 1);
-	}
-
 }

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

@@ -1,42 +0,0 @@
-/*
- * Copyright 2002-2014 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.aop.interceptor;
-
-import java.lang.reflect.Method;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * A default {@link AsyncUncaughtExceptionHandler} that simply logs the exception.
- *
- * @author Stephane Nicoll
- * @since 4.1
- */
-public class SimpleAsyncUncaughtExceptionHandler implements AsyncUncaughtExceptionHandler {
-
-	private final Log logger = LogFactory.getLog(SimpleAsyncUncaughtExceptionHandler.class);
-
-	@Override
-	public void handleUncaughtException(Throwable ex, Method method, Object... params) {
-		if (logger.isErrorEnabled()) {
-			logger.error(String.format("Unexpected error occurred invoking async " +
-					"method '%s'.", method), ex);
-		}
-	}
-
-}

spring-aop/src/main/java/org/springframework/aop/interceptor/package-info.java

@@ -1,6 +1,10 @@
+
 /**
+ *
  * Provides miscellaneous interceptor implementations.
  * More specific interceptors can be found in corresponding
  * functionality packages, like "transaction" and "orm".
+ *
  */
 package org.springframework.aop.interceptor;
+

spring-aop/src/main/java/org/springframework/aop/package-info.java

@@ -1,20 +1,25 @@
+
 /**
+ *
  * Core Spring AOP interfaces, built on AOP Alliance AOP interoperability interfaces.
  *
- * <p>Any AOP Alliance MethodInterceptor is usable in Spring.
+ * <br>Any AOP Alliance MethodInterceptor is usable in Spring.
  *
  * <br>Spring AOP also offers:
  * <ul>
- * <li>Introduction support
- * <li>A Pointcut abstraction, supporting "static" pointcuts
- * (class and method-based) and "dynamic" pointcuts (also considering method arguments).
- * There are currently no AOP Alliance interfaces for pointcuts.
- * <li>A full range of advice types, including around, before, after returning and throws advice.
- * <li>Extensibility allowing arbitrary custom advice types to
- * be plugged in without modifying the core framework.
+ * 	<li>Introduction support
+ * 	<li>A Pointcut abstraction, supporting "static" pointcuts
+ * 		(class and method-based) and "dynamic" pointcuts (also considering method arguments).
+ * 		There are currently no AOP Alliance interfaces for pointcuts.
+ * 	<li>A full range of advice types, including around, before, after returning and throws advice.
+ * 	<li>Extensibility allowing arbitrary custom advice types to
+ * 		be plugged in without modifying the core framework.
  * </ul>
  *
- * <p>Spring AOP can be used programmatically or (preferably)
+ * <br>
+ * Spring AOP can be used programmatically or (preferably)
  * integrated with the Spring IoC container.
+ *
  */
 package org.springframework.aop;
+

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

@@ -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.
@@ -97,13 +97,4 @@ public abstract class ScopedProxyUtils {
 		return TARGET_NAME_PREFIX + originalBeanName;
 	}
 
-	/**
-	 * Specify if the {@code beanName} is the name of a bean that references the target
-	 * bean within a scoped proxy.
-	 * @since 4.1.4
-	 */
-	public static boolean isScopedTarget(String beanName) {
-		return (beanName != null && beanName.startsWith(TARGET_NAME_PREFIX));
-	}
-
 }

spring-aop/src/main/java/org/springframework/aop/scope/package-info.java

@@ -1,4 +1,8 @@
+
 /**
+ *
  * Support for AOP-based scoping of target objects, with configurable backend.
+ *
  */
 package org.springframework.aop.scope;
+

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2014 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,8 +40,7 @@ import org.springframework.util.ReflectionUtils;
 
 /**
  * Utility methods for AOP support code.
- *
- * <p>Mainly for internal use within Spring's AOP support.
+ * Mainly for internal use within Spring's AOP support.
  *
  * <p>See {@link org.springframework.aop.framework.AopProxyUtils} for a
  * collection of framework-specific AOP utility methods which depend
@@ -56,8 +55,6 @@ public abstract class AopUtils {
 
 	/**
 	 * Check whether the given object is a JDK dynamic proxy or a CGLIB proxy.
-	 * <p>This method additionally checks if the given object is an instance
-	 * of {@link SpringProxy}.
 	 * @param object the object to check
 	 * @see #isJdkDynamicProxy
 	 * @see #isCglibProxy
@@ -69,9 +66,6 @@ public abstract class AopUtils {
 
 	/**
 	 * Check whether the given object is a JDK dynamic proxy.
-	 * <p>This method goes beyond the implementation of
-	 * {@link Proxy#isProxyClass(Class)} by additionally checking if the
-	 * given object is an instance of {@link SpringProxy}.
 	 * @param object the object to check
 	 * @see java.lang.reflect.Proxy#isProxyClass
 	 */
@@ -80,10 +74,9 @@ public abstract class AopUtils {
 	}
 
 	/**
-	 * Check whether the given object is a CGLIB proxy.
-	 * <p>This method goes beyond the implementation of
-	 * {@link ClassUtils#isCglibProxy(Object)} by additionally checking if
-	 * the given object is an instance of {@link SpringProxy}.
+	 * Check whether the given object is a CGLIB proxy. Goes beyond the implementation
+	 * in {@link ClassUtils#isCglibProxy(Object)} by checking also to see if the given
+	 * object is an instance of {@link SpringProxy}.
 	 * @param object the object to check
 	 * @see ClassUtils#isCglibProxy(Object)
 	 */
@@ -91,9 +84,29 @@ public abstract class AopUtils {
 		return (object instanceof SpringProxy && ClassUtils.isCglibProxy(object));
 	}
 
+	/**
+	 * Check whether the specified class is a CGLIB-generated class.
+	 * @param clazz the class to check
+	 * @deprecated as of Spring 3.1 in favor of {@link ClassUtils#isCglibProxyClass(Class)}
+	 */
+	@Deprecated
+	public static boolean isCglibProxyClass(Class<?> clazz) {
+		return ClassUtils.isCglibProxyClass(clazz);
+	}
+
+	/**
+	 * Check whether the specified class name is a CGLIB-generated class.
+	 * @param className the class name to check
+	 * @deprecated as of Spring 3.1 in favor of {@link ClassUtils#isCglibProxyClassName(String)}
+	 */
+	@Deprecated
+	public static boolean isCglibProxyClassName(String className) {
+		return ClassUtils.isCglibProxyClassName(className);
+	}
+
 	/**
 	 * Determine the target class of the given bean instance which might be an AOP proxy.
-	 * <p>Returns the target class for an AOP proxy or the plain class otherwise.
+	 * <p>Returns the target class for an AOP proxy and the plain class else.
 	 * @param candidate the instance to check (might be an AOP proxy)
 	 * @return the target class (or the plain class of the given object as fallback;
 	 * never {@code null})
@@ -167,6 +180,7 @@ public abstract class AopUtils {
 		return BridgeMethodResolver.findBridgedMethod(resolvedMethod);
 	}
 
+
 	/**
 	 * Can the given pointcut apply at all on the given class?
 	 * <p>This is an important test as it can be used to optimize
@@ -284,6 +298,7 @@ public abstract class AopUtils {
 		return eligibleAdvisors;
 	}
 
+
 	/**
 	 * Invoke the given target via reflection, as part of an AOP method invocation.
 	 * @param target the target object

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

@@ -18,9 +18,9 @@ package org.springframework.aop.support;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
-import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Arrays;
 
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.PatternMatchUtils;

spring-aop/src/main/java/org/springframework/aop/support/annotation/package-info.java

@@ -1,4 +1,8 @@
+
 /**
+ *
  * Annotation support for AOP pointcuts.
+ *
  */
 package org.springframework.aop.support.annotation;
+

spring-aop/src/main/java/org/springframework/aop/support/package-info.java

@@ -1,4 +1,8 @@
+
 /**
+ *
  * Convenience classes for using Spring's AOP API.
+ *
  */
 package org.springframework.aop.support;
+

spring-aop/src/main/java/org/springframework/aop/target/AbstractBeanFactoryBasedTargetSource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -45,7 +45,7 @@ import org.springframework.util.ObjectUtils;
  * @see LazyInitTargetSource
  * @see PrototypeTargetSource
  * @see ThreadLocalTargetSource
- * @see CommonsPool2TargetSource
+ * @see CommonsPoolTargetSource
  */
 public abstract class AbstractBeanFactoryBasedTargetSource implements TargetSource, BeanFactoryAware, Serializable {
 

spring-aop/src/main/java/org/springframework/aop/target/AbstractPoolingTargetSource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -28,7 +28,7 @@ import org.springframework.beans.factory.DisposableBean;
  * implementations which maintain a pool of target instances, acquiring and
  * releasing a target object from the pool for each method invocation.
  * This abstract base class is independent of concrete pooling technology;
- * see the subclass {@link CommonsPool2TargetSource} for a concrete example.
+ * see the subclass {@link CommonsPoolTargetSource} for a concrete example.
  *
  * <p>Subclasses must implement the {@link #getTarget} and
  * {@link #releaseTarget} methods based on their chosen object pool.

spring-aop/src/main/java/org/springframework/aop/target/AbstractPrototypeBasedTargetSource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2014 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,7 +41,7 @@ import org.springframework.beans.factory.config.ConfigurableBeanFactory;
  * @see org.springframework.beans.factory.BeanFactory#getBean
  * @see PrototypeTargetSource
  * @see ThreadLocalTargetSource
- * @see CommonsPool2TargetSource
+ * @see CommonsPoolTargetSource
  */
 @SuppressWarnings("serial")
 public abstract class AbstractPrototypeBasedTargetSource extends AbstractBeanFactoryBasedTargetSource {

spring-aop/src/main/java/org/springframework/aop/target/CommonsPool2TargetSource.java

@@ -1,289 +0,0 @@
-/*
- * Copyright 2002-2015 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.aop.target;
-
-import org.apache.commons.pool2.ObjectPool;
-import org.apache.commons.pool2.PooledObject;
-import org.apache.commons.pool2.PooledObjectFactory;
-import org.apache.commons.pool2.impl.DefaultPooledObject;
-import org.apache.commons.pool2.impl.GenericObjectPool;
-import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
-
-/**
- * {@link org.springframework.aop.TargetSource} implementation that holds
- * objects in a configurable Apache Commons2 Pool.
- *
- * <p>By default, an instance of {@code GenericObjectPool} is created.
- * Subclasses may change the type of {@code ObjectPool} used by
- * overriding the {@code createObjectPool()} method.
- *
- * <p>Provides many configuration properties mirroring those of the Commons Pool
- * {@code GenericObjectPool} class; these properties are passed to the
- * {@code GenericObjectPool} during construction. If creating a subclass of this
- * class to change the {@code ObjectPool} implementation type, pass in the values
- * of configuration properties that are relevant to your chosen implementation.
- *
- * <p>The {@code testOnBorrow}, {@code testOnReturn} and {@code testWhileIdle}
- * properties are explicitly not mirrored because the implementation of
- * {@code PoolableObjectFactory} used by this class does not implement
- * meaningful validation. All exposed Commons Pool properties use the
- * corresponding Commons Pool defaults.
- *
- * <p>Compatible with Apache Commons Pool 2.4, as of Spring 4.2.
- *
- * @author Rod Johnson
- * @author Rob Harrop
- * @author Juergen Hoeller
- * @author Stephane Nicoll
- * @author Kazuki Shimizu
- * @since 4.2
- * @see GenericObjectPool
- * @see #createObjectPool()
- * @see #setMaxSize
- * @see #setMaxIdle
- * @see #setMinIdle
- * @see #setMaxWait
- * @see #setTimeBetweenEvictionRunsMillis
- * @see #setMinEvictableIdleTimeMillis
- */
-@SuppressWarnings({"rawtypes", "unchecked", "serial"})
-public class CommonsPool2TargetSource extends AbstractPoolingTargetSource implements PooledObjectFactory<Object> {
-
-	private int maxIdle = GenericObjectPoolConfig.DEFAULT_MAX_IDLE;
-
-	private int minIdle = GenericObjectPoolConfig.DEFAULT_MIN_IDLE;
-
-	private long maxWait = GenericObjectPoolConfig.DEFAULT_MAX_WAIT_MILLIS;
-
-	private long timeBetweenEvictionRunsMillis = GenericObjectPoolConfig.DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS;
-
-	private long minEvictableIdleTimeMillis = GenericObjectPoolConfig.DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS;
-
-	private boolean blockWhenExhausted = GenericObjectPoolConfig.DEFAULT_BLOCK_WHEN_EXHAUSTED;
-
-	/**
-	 * The Apache Commons {@code ObjectPool} used to pool target objects
-	 */
-	private ObjectPool pool;
-
-
-	/**
-	 * Create a CommonsPoolTargetSource with default settings.
-	 * Default maximum size of the pool is 8.
-	 * @see #setMaxSize
-	 * @see GenericObjectPoolConfig#setMaxTotal
-	 */
-	public CommonsPool2TargetSource() {
-		setMaxSize(GenericObjectPoolConfig.DEFAULT_MAX_TOTAL);
-	}
-
-
-	/**
-	 * Set the maximum number of idle objects in the pool.
-	 * Default is 8.
-	 * @see GenericObjectPool#setMaxIdle
-	 */
-	public void setMaxIdle(int maxIdle) {
-		this.maxIdle = maxIdle;
-	}
-
-	/**
-	 * Return the maximum number of idle objects in the pool.
-	 */
-	public int getMaxIdle() {
-		return this.maxIdle;
-	}
-
-	/**
-	 * Set the minimum number of idle objects in the pool.
-	 * Default is 0.
-	 * @see GenericObjectPool#setMinIdle
-	 */
-	public void setMinIdle(int minIdle) {
-		this.minIdle = minIdle;
-	}
-
-	/**
-	 * Return the minimum number of idle objects in the pool.
-	 */
-	public int getMinIdle() {
-		return this.minIdle;
-	}
-
-	/**
-	 * Set the maximum waiting time for fetching an object from the pool.
-	 * Default is -1, waiting forever.
-	 * @see GenericObjectPool#setMaxWaitMillis
-	 */
-	public void setMaxWait(long maxWait) {
-		this.maxWait = maxWait;
-	}
-
-	/**
-	 * Return the maximum waiting time for fetching an object from the pool.
-	 */
-	public long getMaxWait() {
-		return this.maxWait;
-	}
-
-	/**
-	 * Set the time between eviction runs that check idle objects whether
-	 * they have been idle for too long or have become invalid.
-	 * Default is -1, not performing any eviction.
-	 * @see GenericObjectPool#setTimeBetweenEvictionRunsMillis
-	 */
-	public void setTimeBetweenEvictionRunsMillis(long timeBetweenEvictionRunsMillis) {
-		this.timeBetweenEvictionRunsMillis = timeBetweenEvictionRunsMillis;
-	}
-
-	/**
-	 * Return the time between eviction runs that check idle objects.
-	 */
-	public long getTimeBetweenEvictionRunsMillis() {
-		return this.timeBetweenEvictionRunsMillis;
-	}
-
-	/**
-	 * Set the minimum time that an idle object can sit in the pool before
-	 * it becomes subject to eviction. Default is 1800000 (30 minutes).
-	 * <p>Note that eviction runs need to be performed to take this
-	 * setting into effect.
-	 * @see #setTimeBetweenEvictionRunsMillis
-	 * @see GenericObjectPool#setMinEvictableIdleTimeMillis
-	 */
-	public void setMinEvictableIdleTimeMillis(long minEvictableIdleTimeMillis) {
-		this.minEvictableIdleTimeMillis = minEvictableIdleTimeMillis;
-	}
-
-	/**
-	 * Return the minimum time that an idle object can sit in the pool.
-	 */
-	public long getMinEvictableIdleTimeMillis() {
-		return this.minEvictableIdleTimeMillis;
-	}
-
-	/**
-	 * Set whether the call should bock when the pool is exhausted.
-	 */
-	public void setBlockWhenExhausted(boolean blockWhenExhausted) {
-		this.blockWhenExhausted = blockWhenExhausted;
-	}
-
-	/**
-	 * Specify if the call should block when the pool is exhausted.
-	 */
-	public boolean isBlockWhenExhausted() {
-		return this.blockWhenExhausted;
-	}
-
-
-	/**
-	 * Creates and holds an ObjectPool instance.
-	 * @see #createObjectPool()
-	 */
-	@Override
-	protected final void createPool() {
-		logger.debug("Creating Commons object pool");
-		this.pool = createObjectPool();
-	}
-
-	/**
-	 * Subclasses can override this if they want to return a specific Commons pool.
-	 * They should apply any configuration properties to the pool here.
-	 * <p>Default is a GenericObjectPool instance with the given pool size.
-	 * @return an empty Commons {@code ObjectPool}.
-	 * @see GenericObjectPool
-	 * @see #setMaxSize
-	 */
-	protected ObjectPool createObjectPool() {
-		GenericObjectPoolConfig config = new GenericObjectPoolConfig();
-		config.setMaxTotal(getMaxSize());
-		config.setMaxIdle(getMaxIdle());
-		config.setMinIdle(getMinIdle());
-		config.setMaxWaitMillis(getMaxWait());
-		config.setTimeBetweenEvictionRunsMillis(getTimeBetweenEvictionRunsMillis());
-		config.setMinEvictableIdleTimeMillis(getMinEvictableIdleTimeMillis());
-		config.setBlockWhenExhausted(isBlockWhenExhausted());
-		return new GenericObjectPool(this, config);
-	}
-
-
-	/**
-	 * Borrows an object from the {@code ObjectPool}.
-	 */
-	@Override
-	public Object getTarget() throws Exception {
-		return this.pool.borrowObject();
-	}
-
-	/**
-	 * Returns the specified object to the underlying {@code ObjectPool}.
-	 */
-	@Override
-	public void releaseTarget(Object target) throws Exception {
-		this.pool.returnObject(target);
-	}
-
-	@Override
-	public int getActiveCount() throws UnsupportedOperationException {
-		return this.pool.getNumActive();
-	}
-
-	@Override
-	public int getIdleCount() throws UnsupportedOperationException {
-		return this.pool.getNumIdle();
-	}
-
-
-	/**
-	 * Closes the underlying {@code ObjectPool} when destroying this object.
-	 */
-	@Override
-	public void destroy() throws Exception {
-		logger.debug("Closing Commons ObjectPool");
-		this.pool.close();
-	}
-
-
-	//----------------------------------------------------------------------------
-	// Implementation of org.apache.commons.pool2.PooledObjectFactory interface
-	//----------------------------------------------------------------------------
-
-	@Override
-	public PooledObject<Object> makeObject() throws Exception {
-		return new DefaultPooledObject<Object>(newPrototypeInstance());
-	}
-
-	@Override
-	public void destroyObject(PooledObject<Object> p) throws Exception {
-		destroyPrototypeInstance(p.getObject());
-	}
-
-	@Override
-	public boolean validateObject(PooledObject<Object> p) {
-		return true;
-	}
-
-	@Override
-	public void activateObject(PooledObject<Object> p) throws Exception {
-	}
-
-	@Override
-	public void passivateObject(PooledObject<Object> p) throws Exception {
-	}
-
-}

spring-aop/src/main/java/org/springframework/aop/target/CommonsPoolTargetSource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -58,10 +58,8 @@ import org.springframework.core.Constants;
  * @see #setMaxWait
  * @see #setTimeBetweenEvictionRunsMillis
  * @see #setMinEvictableIdleTimeMillis
- * @deprecated as of Spring 4.2, in favor of {@link CommonsPool2TargetSource}
  */
 @SuppressWarnings({"rawtypes", "unchecked", "serial"})
-@Deprecated
 public class CommonsPoolTargetSource extends AbstractPoolingTargetSource implements PoolableObjectFactory {
 
 	private static final Constants constants = new Constants(GenericObjectPool.class);
@@ -80,7 +78,7 @@ public class CommonsPoolTargetSource extends AbstractPoolingTargetSource impleme
 	private byte whenExhaustedAction = GenericObjectPool.DEFAULT_WHEN_EXHAUSTED_ACTION;
 
 	/**
-	 * The Apache Commons {@code ObjectPool} used to pool target objects
+	 * The Jakarta Commons {@code ObjectPool} used to pool target objects
 	 */
 	private ObjectPool pool;
 

spring-aop/src/main/resources/META-INF/spring.schemas

@@ -4,6 +4,4 @@ http\://www.springframework.org/schema/aop/spring-aop-3.0.xsd=org/springframewor
 http\://www.springframework.org/schema/aop/spring-aop-3.1.xsd=org/springframework/aop/config/spring-aop-3.1.xsd
 http\://www.springframework.org/schema/aop/spring-aop-3.2.xsd=org/springframework/aop/config/spring-aop-3.2.xsd
 http\://www.springframework.org/schema/aop/spring-aop-4.0.xsd=org/springframework/aop/config/spring-aop-4.0.xsd
-http\://www.springframework.org/schema/aop/spring-aop-4.1.xsd=org/springframework/aop/config/spring-aop-4.1.xsd
-http\://www.springframework.org/schema/aop/spring-aop-4.2.xsd=org/springframework/aop/config/spring-aop-4.2.xsd
-http\://www.springframework.org/schema/aop/spring-aop.xsd=org/springframework/aop/config/spring-aop-4.2.xsd
+http\://www.springframework.org/schema/aop/spring-aop.xsd=org/springframework/aop/config/spring-aop-4.0.xsd

spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-2.0.xsd

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
 <xsd:schema xmlns="http://www.springframework.org/schema/aop"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			xmlns:tool="http://www.springframework.org/schema/tool"
-			targetNamespace="http://www.springframework.org/schema/aop"
-			elementFormDefault="qualified"
-			attributeFormDefault="unqualified">
+		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+		xmlns:beans="http://www.springframework.org/schema/beans"
+		xmlns:tool="http://www.springframework.org/schema/tool"
+		targetNamespace="http://www.springframework.org/schema/aop"
+		elementFormDefault="qualified"
+		attributeFormDefault="unqualified">
 
 	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-2.0.xsd"/>

spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-2.5.xsd

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
 <xsd:schema xmlns="http://www.springframework.org/schema/aop"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			xmlns:tool="http://www.springframework.org/schema/tool"
-			targetNamespace="http://www.springframework.org/schema/aop"
-			elementFormDefault="qualified"
-			attributeFormDefault="unqualified">
+		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+		xmlns:beans="http://www.springframework.org/schema/beans"
+		xmlns:tool="http://www.springframework.org/schema/tool"
+		targetNamespace="http://www.springframework.org/schema/aop"
+		elementFormDefault="qualified"
+		attributeFormDefault="unqualified">
 
 	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-2.5.xsd"/>

spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-3.0.xsd

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
 <xsd:schema xmlns="http://www.springframework.org/schema/aop"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			xmlns:tool="http://www.springframework.org/schema/tool"
-			targetNamespace="http://www.springframework.org/schema/aop"
-			elementFormDefault="qualified"
-			attributeFormDefault="unqualified">
+		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+		xmlns:beans="http://www.springframework.org/schema/beans"
+		xmlns:tool="http://www.springframework.org/schema/tool"
+		targetNamespace="http://www.springframework.org/schema/aop"
+		elementFormDefault="qualified"
+		attributeFormDefault="unqualified">
 
 	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-3.0.xsd"/>

spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-3.1.xsd

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
 <xsd:schema xmlns="http://www.springframework.org/schema/aop"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			xmlns:tool="http://www.springframework.org/schema/tool"
-			targetNamespace="http://www.springframework.org/schema/aop"
-			elementFormDefault="qualified"
-			attributeFormDefault="unqualified">
+		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+		xmlns:beans="http://www.springframework.org/schema/beans"
+		xmlns:tool="http://www.springframework.org/schema/tool"
+		targetNamespace="http://www.springframework.org/schema/aop"
+		elementFormDefault="qualified"
+		attributeFormDefault="unqualified">
 
 	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-3.1.xsd"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-3.1.xsd"/>

spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-3.2.xsd

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
 <xsd:schema xmlns="http://www.springframework.org/schema/aop"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			xmlns:tool="http://www.springframework.org/schema/tool"
-			targetNamespace="http://www.springframework.org/schema/aop"
-			elementFormDefault="qualified"
-			attributeFormDefault="unqualified">
+		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+		xmlns:beans="http://www.springframework.org/schema/beans"
+		xmlns:tool="http://www.springframework.org/schema/tool"
+		targetNamespace="http://www.springframework.org/schema/aop"
+		elementFormDefault="qualified"
+		attributeFormDefault="unqualified">
 
 	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-3.2.xsd"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-3.2.xsd"/>

spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-4.0.xsd

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
 <xsd:schema xmlns="http://www.springframework.org/schema/aop"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			xmlns:tool="http://www.springframework.org/schema/tool"
-			targetNamespace="http://www.springframework.org/schema/aop"
-			elementFormDefault="qualified"
-			attributeFormDefault="unqualified">
+		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+		xmlns:beans="http://www.springframework.org/schema/beans"
+		xmlns:tool="http://www.springframework.org/schema/tool"
+		targetNamespace="http://www.springframework.org/schema/aop"
+		elementFormDefault="qualified"
+		attributeFormDefault="unqualified">
 
 	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-4.0.xsd"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-4.0.xsd"/>

spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-4.1.xsd

@@ -1,409 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<xsd:schema xmlns="http://www.springframework.org/schema/aop"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			xmlns:tool="http://www.springframework.org/schema/tool"
-			targetNamespace="http://www.springframework.org/schema/aop"
-			elementFormDefault="qualified"
-			attributeFormDefault="unqualified">
-
-	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-4.1.xsd"/>
-	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-4.1.xsd"/>
-
-	<xsd:annotation>
-		<xsd:documentation><![CDATA[
-	Defines the configuration elements for the Spring Framework's AOP support.
-		]]></xsd:documentation>
-	</xsd:annotation>
-
-	<xsd:element name="config">
-		<xsd:annotation>
-			<xsd:documentation><![CDATA[
-	A section (compartmentalization) of AOP-specific configuration (including
-	aspects, pointcuts, etc).
-			]]></xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="pointcut" type="pointcutType" minOccurs="0" maxOccurs="unbounded">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
-	A named pointcut definition.
-						]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:element>
-				<xsd:element name="advisor" type="advisorType" minOccurs="0" maxOccurs="unbounded">
-					<xsd:annotation>
-						<xsd:documentation source="java:org.springframework.aop.Advisor"><![CDATA[
-	A named advisor definition.
-						]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:element>
-				<xsd:element name="aspect" type="aspectType" minOccurs="0" maxOccurs="unbounded">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
-	A named aspect definition.
-						]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:element>
-			</xsd:sequence>
-			<xsd:attribute name="proxy-target-class" type="xsd:boolean" default="false">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	Are class-based (CGLIB) proxies to be created? By default, standard
-	Java interface-based proxies are created.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="expose-proxy" type="xsd:boolean" default="false">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	Indicate that the proxy should be exposed by the AOP framework as a
-	ThreadLocal for retrieval via the AopContext class. Off by default,
-	i.e. no guarantees that AopContext access will work.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="aspectj-autoproxy">
-		<xsd:annotation>
-			<xsd:documentation source="java:org.springframework.aop.aspectj.annotation.AnnotationAwareAspectJAutoProxyCreator"><![CDATA[
-	Enables the use of the @AspectJ style of Spring AOP.
-
-	See org.springframework.context.annotation.EnableAspectJAutoProxy Javadoc
-	for information on code-based alternatives to this XML element.
-			]]></xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="include" type="includeType" minOccurs="0" maxOccurs="unbounded">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
-	Indicates that only @AspectJ beans with names matched by the (regex)
-	pattern will be considered as defining aspects to use for Spring autoproxying.
-						]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:element>
-			</xsd:sequence>
-			<xsd:attribute name="proxy-target-class" type="xsd:boolean" default="false">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	Are class-based (CGLIB) proxies to be created? By default, standard
-	Java interface-based proxies are created.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="expose-proxy" type="xsd:boolean" default="false">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	Indicate that the proxy should be exposed by the AOP framework as a
-	ThreadLocal for retrieval via the AopContext class. Off by default,
-	i.e. no guarantees that AopContext access will work.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="scoped-proxy">
-		<xsd:complexType>
-			<xsd:annotation>
-				<xsd:documentation source="java:org.springframework.aop.scope.ScopedProxyFactoryBean"><![CDATA[
-	Marks a bean definition as being a scoped proxy.
-
-	A bean marked as such will be exposed via a proxy, with the 'real'
-	bean instance being retrieved from some other source (such as a
-	HttpSession) as and when required.
-				]]></xsd:documentation>
-			</xsd:annotation>
-			<xsd:attribute name="proxy-target-class" type="xsd:boolean" default="true">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	Are class-based (CGLIB) proxies to be created? This is the default; in order to
-	switch to standard Java interface-based proxies, turn this flag to "false".
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:complexType name="aspectType">
-		<xsd:choice minOccurs="0" maxOccurs="unbounded">
-			<xsd:element name="pointcut" type="pointcutType">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	A named pointcut definition.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-			<xsd:element name="declare-parents" type="declareParentsType">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	Allows this aspect to introduce additional interfaces that the advised
-	object will transparently implement.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-			<xsd:element name="before" type="basicAdviceType">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	A before advice definition.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-			<xsd:element name="after" type="basicAdviceType">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	An after advice definition.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-			<xsd:element name="after-returning" type="afterReturningAdviceType">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	An after-returning advice definition.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-			<xsd:element name="after-throwing" type="afterThrowingAdviceType">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	An after-throwing advice definition.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-			<xsd:element name="around" type="basicAdviceType">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	An around advice definition.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-		</xsd:choice>
-		<xsd:attribute name="id" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	The unique identifier for an aspect.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="ref" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	The name of the (backing) bean that encapsulates the aspect.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="order" type="xsd:token">
-			<xsd:annotation>
-				<xsd:documentation source="java:org.springframework.core.Ordered"><![CDATA[
-	Controls the ordering of the execution of this aspect when multiple
-	advice executes at a specific joinpoint.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:complexType name="includeType">
-		<xsd:attribute name="name" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation source="java:java.util.regex.Pattern"><![CDATA[
-	The regular expression defining which beans are to be included in the
-	list of @AspectJ beans; beans with names matched by the pattern will
-	be included.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:complexType name="pointcutType">
-		<xsd:annotation>
-			<xsd:appinfo>
-				<tool:annotation>
-					<tool:exports type="org.springframework.aop.Pointcut"/>
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:attribute name="id" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	The unique identifier for a pointcut.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="expression" use="required" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	The pointcut expression.
-
-	For example : 'execution(* com.xyz.myapp.service.*.*(..))'
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:complexType name="declareParentsType">
-		<xsd:attribute name="types-matching" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation source="java:org.springframework.aop.aspectj.TypePatternClassFilter"><![CDATA[
-	The AspectJ type expression that defines what types (classes) the
-	introduction is restricted to.
-
-	An example would be 'org.springframework.beans.ITestBean+'.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="implement-interface" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation source="java:java.lang.Class"><![CDATA[
-	The fully qualified name of the interface that will be introduced.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="default-impl" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation source="java:java.lang.Class"><![CDATA[
-	The fully qualified name of the class that will be instantiated to serve
-	as the default implementation of the introduced interface.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="delegate-ref" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	A reference to the bean that will serve
-	as the default implementation of the introduced interface.
-				]]></xsd:documentation>
-				<xsd:appinfo>
-					<tool:annotation kind="ref"/>
-				</xsd:appinfo>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:complexType name="basicAdviceType">
-		<xsd:attribute name="pointcut" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	The associated pointcut expression.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="pointcut-ref" type="pointcutRefType">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	The name of an associated pointcut definition.
-				]]></xsd:documentation>
-				<xsd:appinfo>
-					<tool:annotation kind="ref">
-						<tool:expected-type type="org.springframework.aop.Pointcut"/>
-					</tool:annotation>
-				</xsd:appinfo>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="method" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	The name of the method that defines the logic of the advice.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="arg-names" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	The comma-delimited list of advice method argument (parameter) names
-	that will be matched from pointcut parameters.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:complexType name="afterReturningAdviceType">
-		<xsd:complexContent>
-			<xsd:extension base="basicAdviceType">
-				<xsd:attribute name="returning" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
-	The name of the method parameter to which the return value must
-	be passed.
-						]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="afterThrowingAdviceType">
-		<xsd:complexContent>
-			<xsd:extension base="basicAdviceType">
-				<xsd:attribute name="throwing" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
-	The name of the method parameter to which the thrown exception must
-	be passed.
-						]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="advisorType">
-		<xsd:annotation>
-			<xsd:appinfo>
-				<tool:annotation>
-					<tool:exports type="org.springframework.aop.Advisor"/>
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:attribute name="id" type="xsd:string"/>
-		<xsd:attribute name="advice-ref" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	A reference to an advice bean.
-				]]></xsd:documentation>
-				<xsd:appinfo>
-					<tool:annotation kind="ref">
-						<tool:expected-type type="org.aopalliance.aop.Advice"/>
-					</tool:annotation>
-				</xsd:appinfo>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="pointcut" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	A pointcut expression.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="pointcut-ref" type="pointcutRefType">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	A reference to a pointcut definition.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="order" type="xsd:token">
-			<xsd:annotation>
-				<xsd:documentation source="java:org.springframework.core.Ordered"><![CDATA[
-	Controls the ordering of the execution of this advice when multiple
-	advice executes at a specific joinpoint.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:simpleType name="pointcutRefType">
-		<xsd:annotation>
-			<xsd:appinfo>
-				<tool:annotation kind="ref">
-					<tool:expected-type type="org.springframework.aop.Pointcut"/>
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:union memberTypes="xsd:string"/>
-	</xsd:simpleType>
-
-</xsd:schema>

spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-4.2.xsd

@@ -1,409 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<xsd:schema xmlns="http://www.springframework.org/schema/aop"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			xmlns:tool="http://www.springframework.org/schema/tool"
-			targetNamespace="http://www.springframework.org/schema/aop"
-			elementFormDefault="qualified"
-			attributeFormDefault="unqualified">
-
-	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-4.2.xsd"/>
-	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-4.2.xsd"/>
-
-	<xsd:annotation>
-		<xsd:documentation><![CDATA[
-	Defines the configuration elements for the Spring Framework's AOP support.
-		]]></xsd:documentation>
-	</xsd:annotation>
-
-	<xsd:element name="config">
-		<xsd:annotation>
-			<xsd:documentation><![CDATA[
-	A section (compartmentalization) of AOP-specific configuration (including
-	aspects, pointcuts, etc).
-			]]></xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="pointcut" type="pointcutType" minOccurs="0" maxOccurs="unbounded">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
-	A named pointcut definition.
-						]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:element>
-				<xsd:element name="advisor" type="advisorType" minOccurs="0" maxOccurs="unbounded">
-					<xsd:annotation>
-						<xsd:documentation source="java:org.springframework.aop.Advisor"><![CDATA[
-	A named advisor definition.
-						]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:element>
-				<xsd:element name="aspect" type="aspectType" minOccurs="0" maxOccurs="unbounded">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
-	A named aspect definition.
-						]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:element>
-			</xsd:sequence>
-			<xsd:attribute name="proxy-target-class" type="xsd:boolean" default="false">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	Are class-based (CGLIB) proxies to be created? By default, standard
-	Java interface-based proxies are created.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="expose-proxy" type="xsd:boolean" default="false">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	Indicate that the proxy should be exposed by the AOP framework as a
-	ThreadLocal for retrieval via the AopContext class. Off by default,
-	i.e. no guarantees that AopContext access will work.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="aspectj-autoproxy">
-		<xsd:annotation>
-			<xsd:documentation source="java:org.springframework.aop.aspectj.annotation.AnnotationAwareAspectJAutoProxyCreator"><![CDATA[
-	Enables the use of the @AspectJ style of Spring AOP.
-
-	See org.springframework.context.annotation.EnableAspectJAutoProxy Javadoc
-	for information on code-based alternatives to this XML element.
-			]]></xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="include" type="includeType" minOccurs="0" maxOccurs="unbounded">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
-	Indicates that only @AspectJ beans with names matched by the (regex)
-	pattern will be considered as defining aspects to use for Spring autoproxying.
-						]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:element>
-			</xsd:sequence>
-			<xsd:attribute name="proxy-target-class" type="xsd:boolean" default="false">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	Are class-based (CGLIB) proxies to be created? By default, standard
-	Java interface-based proxies are created.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="expose-proxy" type="xsd:boolean" default="false">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	Indicate that the proxy should be exposed by the AOP framework as a
-	ThreadLocal for retrieval via the AopContext class. Off by default,
-	i.e. no guarantees that AopContext access will work.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="scoped-proxy">
-		<xsd:complexType>
-			<xsd:annotation>
-				<xsd:documentation source="java:org.springframework.aop.scope.ScopedProxyFactoryBean"><![CDATA[
-	Marks a bean definition as being a scoped proxy.
-
-	A bean marked as such will be exposed via a proxy, with the 'real'
-	bean instance being retrieved from some other source (such as a
-	HttpSession) as and when required.
-				]]></xsd:documentation>
-			</xsd:annotation>
-			<xsd:attribute name="proxy-target-class" type="xsd:boolean" default="true">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	Are class-based (CGLIB) proxies to be created? This is the default; in order to
-	switch to standard Java interface-based proxies, turn this flag to "false".
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:complexType name="aspectType">
-		<xsd:choice minOccurs="0" maxOccurs="unbounded">
-			<xsd:element name="pointcut" type="pointcutType">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	A named pointcut definition.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-			<xsd:element name="declare-parents" type="declareParentsType">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	Allows this aspect to introduce additional interfaces that the advised
-	object will transparently implement.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-			<xsd:element name="before" type="basicAdviceType">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	A before advice definition.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-			<xsd:element name="after" type="basicAdviceType">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	An after advice definition.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-			<xsd:element name="after-returning" type="afterReturningAdviceType">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	An after-returning advice definition.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-			<xsd:element name="after-throwing" type="afterThrowingAdviceType">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	An after-throwing advice definition.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-			<xsd:element name="around" type="basicAdviceType">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	An around advice definition.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-		</xsd:choice>
-		<xsd:attribute name="id" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	The unique identifier for an aspect.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="ref" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	The name of the (backing) bean that encapsulates the aspect.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="order" type="xsd:token">
-			<xsd:annotation>
-				<xsd:documentation source="java:org.springframework.core.Ordered"><![CDATA[
-	Controls the ordering of the execution of this aspect when multiple
-	advice executes at a specific joinpoint.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:complexType name="includeType">
-		<xsd:attribute name="name" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation source="java:java.util.regex.Pattern"><![CDATA[
-	The regular expression defining which beans are to be included in the
-	list of @AspectJ beans; beans with names matched by the pattern will
-	be included.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:complexType name="pointcutType">
-		<xsd:annotation>
-			<xsd:appinfo>
-				<tool:annotation>
-					<tool:exports type="org.springframework.aop.Pointcut"/>
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:attribute name="id" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	The unique identifier for a pointcut.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="expression" use="required" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	The pointcut expression.
-
-	For example : 'execution(* com.xyz.myapp.service.*.*(..))'
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:complexType name="declareParentsType">
-		<xsd:attribute name="types-matching" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation source="java:org.springframework.aop.aspectj.TypePatternClassFilter"><![CDATA[
-	The AspectJ type expression that defines what types (classes) the
-	introduction is restricted to.
-
-	An example would be 'org.springframework.beans.ITestBean+'.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="implement-interface" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation source="java:java.lang.Class"><![CDATA[
-	The fully qualified name of the interface that will be introduced.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="default-impl" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation source="java:java.lang.Class"><![CDATA[
-	The fully qualified name of the class that will be instantiated to serve
-	as the default implementation of the introduced interface.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="delegate-ref" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	A reference to the bean that will serve
-	as the default implementation of the introduced interface.
-				]]></xsd:documentation>
-				<xsd:appinfo>
-					<tool:annotation kind="ref"/>
-				</xsd:appinfo>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:complexType name="basicAdviceType">
-		<xsd:attribute name="pointcut" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	The associated pointcut expression.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="pointcut-ref" type="pointcutRefType">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	The name of an associated pointcut definition.
-				]]></xsd:documentation>
-				<xsd:appinfo>
-					<tool:annotation kind="ref">
-						<tool:expected-type type="org.springframework.aop.Pointcut"/>
-					</tool:annotation>
-				</xsd:appinfo>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="method" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	The name of the method that defines the logic of the advice.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="arg-names" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	The comma-delimited list of advice method argument (parameter) names
-	that will be matched from pointcut parameters.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:complexType name="afterReturningAdviceType">
-		<xsd:complexContent>
-			<xsd:extension base="basicAdviceType">
-				<xsd:attribute name="returning" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
-	The name of the method parameter to which the return value must
-	be passed.
-						]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="afterThrowingAdviceType">
-		<xsd:complexContent>
-			<xsd:extension base="basicAdviceType">
-				<xsd:attribute name="throwing" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
-	The name of the method parameter to which the thrown exception must
-	be passed.
-						]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="advisorType">
-		<xsd:annotation>
-			<xsd:appinfo>
-				<tool:annotation>
-					<tool:exports type="org.springframework.aop.Advisor"/>
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:attribute name="id" type="xsd:string"/>
-		<xsd:attribute name="advice-ref" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	A reference to an advice bean.
-				]]></xsd:documentation>
-				<xsd:appinfo>
-					<tool:annotation kind="ref">
-						<tool:expected-type type="org.aopalliance.aop.Advice"/>
-					</tool:annotation>
-				</xsd:appinfo>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="pointcut" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	A pointcut expression.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="pointcut-ref" type="pointcutRefType">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	A reference to a pointcut definition.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="order" type="xsd:token">
-			<xsd:annotation>
-				<xsd:documentation source="java:org.springframework.core.Ordered"><![CDATA[
-	Controls the ordering of the execution of this advice when multiple
-	advice executes at a specific joinpoint.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:simpleType name="pointcutRefType">
-		<xsd:annotation>
-			<xsd:appinfo>
-				<tool:annotation kind="ref">
-					<tool:expected-type type="org.springframework.aop.Pointcut"/>
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:union memberTypes="xsd:string"/>
-	</xsd:simpleType>
-
-</xsd:schema>

spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscovererTests.java

@@ -15,14 +15,13 @@
  */
 package org.springframework.aop.aspectj;
 
-import java.lang.reflect.Method;
+import static org.junit.Assert.*;
 
 import org.aspectj.lang.JoinPoint;
 import org.junit.Test;
-
 import org.springframework.aop.aspectj.AspectJAdviceParameterNameDiscoverer.AmbiguousBindingException;
 
-import static org.junit.Assert.*;
+import java.lang.reflect.Method;
 
 /**
  * Unit tests for the {@link AspectJAdviceParameterNameDiscoverer} class.

spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java

@@ -16,6 +16,8 @@
 
 package org.springframework.aop.aspectj;
 
+import static org.junit.Assert.*;
+
 import java.lang.reflect.Method;
 
 import org.aopalliance.intercept.MethodInterceptor;
@@ -25,19 +27,17 @@ import org.aspectj.weaver.tools.PointcutPrimitive;
 import org.aspectj.weaver.tools.UnsupportedPointcutPrimitiveException;
 import org.junit.Before;
 import org.junit.Test;
-
 import org.springframework.aop.ClassFilter;
 import org.springframework.aop.MethodMatcher;
 import org.springframework.aop.Pointcut;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
+
 import org.springframework.tests.sample.beans.IOther;
 import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.tests.sample.beans.subpkg.DeepBean;
 
-import static org.junit.Assert.*;
-
 /**
  * @author Rob Harrop
  * @author Rod Johnson

spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java

@@ -16,12 +16,12 @@
 
 package org.springframework.aop.aspectj;
 
+import static org.junit.Assert.*;
+
 import org.junit.Test;
 
 import org.springframework.tests.sample.beans.TestBean;
 
-import static org.junit.Assert.*;
-
 /**
  * Tests for matching of bean() pointcut designator.
  *

spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 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.
@@ -26,17 +26,16 @@ import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.aspectj.lang.reflect.SourceLocation;
 import org.aspectj.runtime.reflect.Factory;
+import static org.junit.Assert.*;
 import org.junit.Test;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 import org.springframework.aop.MethodBeforeAdvice;
 import org.springframework.aop.framework.AopContext;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.interceptor.ExposeInvocationInterceptor;
 import org.springframework.aop.support.AopUtils;
-import org.springframework.tests.sample.beans.ITestBean;
-import org.springframework.tests.sample.beans.TestBean;
-
-import static org.junit.Assert.*;
 
 /**
  * @author Rod Johnson
@@ -211,7 +210,7 @@ public final class MethodInvocationProceedingJoinPointTests {
 		itb.setName("foo");
 		itb.getDoctor();
 		itb.getStringArray();
-		itb.getSpouse();
+		itb.getSpouses();
 		itb.setSpouse(new TestBean());
 		try {
 			itb.unreliableFileOperation();

spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJAdviceParameterNameDiscovererTests.java

@@ -17,7 +17,6 @@
 package org.springframework.aop.aspectj;
 
 import org.junit.Test;
-
 import org.springframework.aop.aspectj.AspectJAdviceParameterNameDiscoverer.AmbiguousBindingException;
 
 /**

spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java

@@ -16,6 +16,9 @@
 
 package org.springframework.aop.aspectj;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.List;
@@ -23,13 +26,11 @@ import java.util.Map;
 
 import org.junit.Before;
 import org.junit.Test;
+
 import test.annotation.EmptySpringAnnotation;
 import test.annotation.transaction.Tx;
-
 import org.springframework.tests.sample.beans.TestBean;
 
-import static org.junit.Assert.*;
-
 /**
  * Java5-specific {@link AspectJExpressionPointcutTests}.
  *

spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java

@@ -1,5 +1,8 @@
 package org.springframework.aop.aspectj;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -9,7 +12,6 @@ import java.lang.annotation.Target;
 import java.lang.reflect.Method;
 
 import org.junit.Test;
-
 import org.springframework.aop.Advisor;
 import org.springframework.aop.MethodBeforeAdvice;
 import org.springframework.aop.ThrowsAdvice;
@@ -17,8 +19,6 @@ import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
 import org.springframework.core.OverridingClassLoader;
 
-import static org.junit.Assert.*;
-
 /**
  * @author Dave Syer
  */

spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java

@@ -16,18 +16,18 @@
 
 package org.springframework.aop.aspectj;
 
-import org.junit.Test;
+import static org.junit.Assert.*;
 
+import org.junit.Test;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+
 import org.springframework.tests.sample.beans.CountingTestBean;
 import org.springframework.tests.sample.beans.IOther;
 import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.tests.sample.beans.subpkg.DeepBean;
 
-import static org.junit.Assert.*;
-
 /**
  * Unit tests for the {@link TypePatternClassFilter} class.
  *

spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java

@@ -37,12 +37,8 @@ import org.aspectj.lang.annotation.DeclareParents;
 import org.aspectj.lang.annotation.DeclarePrecedence;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
-import org.junit.Ignore;
+
 import org.junit.Test;
-import test.aop.DefaultLockable;
-import test.aop.Lockable;
-import test.aop.PerTargetAspect;
-import test.aop.TwoAdviceAspect;
 
 import org.springframework.aop.Advisor;
 import org.springframework.aop.aspectj.annotation.ReflectiveAspectJAdvisorFactory.SyntheticInstantiationAdvisor;
@@ -58,6 +54,11 @@ import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.util.ObjectUtils;
 
+import test.aop.DefaultLockable;
+import test.aop.Lockable;
+import test.aop.PerTargetAspect;
+import test.aop.TwoAdviceAspect;
+
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
@@ -401,8 +402,8 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 
 	@Test
 	public void testIntroductionOnTargetExcludedByTypePattern() {
-		LinkedList<Object> target = new LinkedList<Object>();
-		List<?> proxy = (List<?>) createProxy(target,
+		LinkedList target = new LinkedList();
+		List proxy = (List) createProxy(target,
 				AopUtils.findAdvisorsThatCanApply(
 						getFixture().getAdvisors(new SingletonMetadataAwareAspectInstanceFactory(new MakeLockable(), "someBean")),
 						List.class
@@ -430,9 +431,7 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 
 	// TODO: Why does this test fail? It hasn't been run before, so it maybe never actually passed...
 
-	@Test
-	@Ignore
-	public void testIntroductionWithArgumentBinding() {
+	public void XtestIntroductionWithArgumentBinding() {
 		TestBean target = new TestBean();
 
 		List<Advisor> advisors = getFixture().getAdvisors(

spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java

@@ -16,6 +16,8 @@
 
 package org.springframework.aop.aspectj.annotation;
 
+import static org.junit.Assert.*;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.Method;
@@ -25,13 +27,11 @@ import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.junit.Test;
-
 import org.springframework.aop.aspectj.AspectJAdviceParameterNameDiscoverer;
+
 import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.tests.sample.beans.TestBean;
 
-import static org.junit.Assert.*;
-
 /**
  * @author Adrian Colyer
  * @author Juergen Hoeller

spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java

@@ -16,16 +16,16 @@
 
 package org.springframework.aop.aspectj.annotation;
 
-import org.junit.Test;
-import test.aop.PerTargetAspect;
+import static org.junit.Assert.*;
 
+import org.junit.Test;
 import org.springframework.aop.Pointcut;
 import org.springframework.aop.aspectj.AspectJExpressionPointcut;
 import org.springframework.aop.aspectj.AspectJExpressionPointcutTests;
 import org.springframework.aop.framework.AopConfigException;
-import org.springframework.tests.sample.beans.TestBean;
 
-import static org.junit.Assert.*;
+import test.aop.PerTargetAspect;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * @author Rod Johnson

spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java

@@ -16,14 +16,14 @@
 
 package org.springframework.aop.aspectj.annotation;
 
+import static org.junit.Assert.*;
 import org.aspectj.lang.reflect.PerClauseKind;
 import org.junit.Test;
-import test.aop.PerTargetAspect;
 
 import org.springframework.aop.Pointcut;
 import org.springframework.aop.aspectj.annotation.AbstractAspectJAdvisorFactoryTests.ExceptionAspect;
 
-import static org.junit.Assert.*;
+import test.aop.PerTargetAspect;
 
 /**
  * @since 2.0

spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 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.
@@ -16,31 +16,25 @@
 
 package org.springframework.aop.aspectj.annotation;
 
-import java.util.Arrays;
-
-import org.apache.commons.logging.LogFactory;
+import static org.junit.Assert.assertEquals;
 
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
-
 import org.junit.Ignore;
 import org.junit.Test;
-
 import org.springframework.util.SerializationTestUtils;
 
 import test.aop.PerThisAspect;
 
-import static org.junit.Assert.*;
-
 /**
  * @author Rob Harrop
  * @author Juergen Hoeller
  * @author Chris Beams
  */
-public class AspectProxyFactoryTests {
+public final class AspectProxyFactoryTests {
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test(expected=IllegalArgumentException.class)
 	public void testWithNonAspect() {
 		AspectJProxyFactory proxyFactory = new AspectJProxyFactory(new TestBean());
 		proxyFactory.addAspect(TestBean.class);
@@ -76,7 +70,7 @@ public class AspectProxyFactoryTests {
 		assertEquals(2, proxy1.getAge());
 	}
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test(expected=IllegalArgumentException.class)
 	public void testWithInstanceWithNonAspect() throws Exception {
 		AspectJProxyFactory pf = new AspectJProxyFactory();
 		pf.addAspect(new TestBean());
@@ -102,23 +96,14 @@ public class AspectProxyFactoryTests {
 		assertEquals(target.getAge() * multiple, serializedProxy.getAge());
 	}
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test(expected=IllegalArgumentException.class)
 	public void testWithNonSingletonAspectInstance() throws Exception {
 		AspectJProxyFactory pf = new AspectJProxyFactory();
 		pf.addAspect(new PerThisAspect());
 	}
 
-	@Test  // SPR-13328
-	public void testVarargsWithEnumArray() throws Exception {
-		AspectJProxyFactory proxyFactory = new AspectJProxyFactory(new TestBean());
-		proxyFactory.addAspect(LoggingAspect.class);
-		proxyFactory.setProxyTargetClass(true);
-		TestBean proxy = proxyFactory.getProxy();
-		assertTrue(proxy.doWithVarargs(MyEnum.A, MyEnum.B));
-	}
 
-
-	public interface ITestBean {
+	public static interface ITestBean {
 
 		int getAge();
 	}
@@ -136,33 +121,8 @@ public class AspectProxyFactoryTests {
 		public void setAge(int age) {
 			this.age = age;
 		}
-
-		@SuppressWarnings("unchecked")
-		public <V extends MyInterface> boolean doWithVarargs(V... args) {
-			return true;
-		}
 	}
 
-
-	public interface MyInterface {
-	}
-
-
-	public enum MyEnum implements MyInterface {
-
-		A, B;
-	}
-
-
-	@Aspect
-	public static class LoggingAspect {
-
-		@Around("execution(* doWithVarargs(*))")
-		public Object doLog(ProceedingJoinPoint pjp) throws Throwable {
-			LogFactory.getLog(LoggingAspect.class).debug(Arrays.asList(pjp.getArgs()));
-			return pjp.proceed();
-		}
-	}
 }
 
 

spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJNamespaceHandlerTests.java

@@ -16,9 +16,10 @@
 
 package org.springframework.aop.aspectj.autoproxy;
 
+import static org.junit.Assert.assertEquals;
+
 import org.junit.Before;
 import org.junit.Test;
-
 import org.springframework.aop.config.AopConfigUtils;
 import org.springframework.aop.config.AopNamespaceUtils;
 import org.springframework.beans.factory.config.BeanDefinition;
@@ -31,8 +32,6 @@ import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.beans.factory.xml.XmlReaderContext;
 import org.springframework.tests.beans.CollectingReaderEventListener;
 
-import static org.junit.Assert.*;
-
 /**
  * @author Rob Harrop
  * @author Chris Beams

spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java

@@ -16,12 +16,16 @@
 
 package org.springframework.aop.config;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.springframework.tests.TestResourceUtils.qualifiedResource;
+
 import java.util.HashSet;
 import java.util.Set;
 
 import org.junit.Before;
 import org.junit.Test;
-
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanReference;
 import org.springframework.beans.factory.parsing.BeanComponentDefinition;
@@ -32,9 +36,6 @@ import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
 import org.springframework.tests.beans.CollectingReaderEventListener;
 
-import static org.junit.Assert.*;
-import static org.springframework.tests.TestResourceUtils.*;
-
 /**
  * @author Rob Harrop
  * @author Juergen Hoeller

spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java

@@ -16,16 +16,16 @@
 
 package org.springframework.aop.config;
 
-import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.springframework.tests.TestResourceUtils.qualifiedResource;
 
+import org.junit.Test;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 
-import static org.junit.Assert.*;
-import static org.springframework.tests.TestResourceUtils.*;
-
 /**
  * @author Mark Fisher
  * @author Chris Beams

spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests.java

@@ -16,15 +16,14 @@
 
 package org.springframework.aop.config;
 
-import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+import static org.springframework.tests.TestResourceUtils.qualifiedResource;
 
+import org.junit.Test;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
 
-import static org.junit.Assert.*;
-import static org.springframework.tests.TestResourceUtils.*;
-
 /**
  * Tests that the <aop:config/> element can be used as a top level element.
  *