Update JavaScriptUtils

Add escaping for <, >, and PS/LS line terminators Issue: SPR-9983
Increment version to 3.1.5.BUILD-SNAPSHOT
2026-06-08 17:33:33 +00:00 · 2013-02-15 06:45:54 -05:00 · 2013-01-23 15:00:13 +01:00 · 2013-01-23 14:58:18 +01:00 · 2013-01-23 12:53:25 +01:00 · 2013-01-23 12:47:49 +01:00
6662 changed files with 49677 additions and 80899 deletions
@@ -4,24 +4,23 @@
 .DS_Store
 .settings
 .springBeans
-target
 bin
 build.sh
 integration-repo
 ivy-cache
 jxl.log
 jmx.log
-spring-jdbc/derby.log
-spring-test/test-output/
-.gradle
-build
-.classpath
-.project
-argfile*
-pom.xml
+org.springframework.jdbc/derby.log
+org.springframework.spring-parent/.classpath
+org.springframework.spring-parent/.project
+org.springframework.test/test-output/
+target
+spring-build/lib/docbook

-# IDEA metadata and output dirs
-*.iml
-*.ipr
-*.iws
-out
+# ignore files and directories related to gradle build
+/.classpath
+/.project
+/.gradle
+/build
+/spring-*
+!/spring-framework-reference
@@ -1,9 +0,0 @@
-#com.springsource.sts.gradle.core.preferences.GradleImportPreferences
-#Thu Aug  9 11:34:43 CEST 2012
-enableAfterTasks=true
-afterTasks=afterEclipseImport;
-enableDependendencyManagement=false
-enableBeforeTasks=true
-projects=;spring-aop;spring-aspects;spring-beans;spring-context;spring-context-support;spring-core;spring-expression;spring-instrument;spring-instrument-tomcat;spring-jdbc;spring-jms;spring-orm;spring-oxm;spring-struts;spring-test;spring-tx;spring-web;spring-webmvc;spring-webmvc-portlet;
-enableDSLD=false
-beforeTasks=cleanEclipse;eclipse;\:spring-oxm\:compileTestJava;
@@ -1,5 +0,0 @@
-#com.springsource.sts.gradle.core.preferences.GradleProjectPreferences
-#Tue Feb 21 14:38:31 CET 2012
-com.springsource.sts.gradle.classpath.enableSorting=false
-com.springsource.sts.gradle.rootprojectloc=
-com.springsource.sts.gradle.linkedresources=
@@ -1,9 +0,0 @@
-#com.springsource.sts.gradle.core.actions.GradleRefreshPreferences
-#Thu Aug  9 11:34:43 CEST 2012
-enableAfterTasks=true
-afterTasks=afterEclipseImport;
-useHierarchicalNames=false
-enableBeforeTasks=true
-addResourceFilters=false
-enableDSLD=false
-beforeTasks=cleanEclipse;eclipse;\:spring-oxm\:compileTestJava;
@@ -1,307 +0,0 @@
-_Have something you'd like to contribute to the framework?  We welcome pull
-requests, but ask that you carefully read this document first to understand how
-best to submit them; what kind of changes are likely to be accepted; and what
-to expect from the Spring team when evaluating your submission._
-
-_Please refer back to this document as a checklist before issuing any pull
-request; this will save time for everyone!_
-
-## Understand the basics
-
-Not sure what a pull request is, or how to submit one?  Take a look at GitHub's
-excellent [help documentation][] first.
-
-
-## Search JIRA first; create an issue if necessary
-
-Is there already an issue that addresses your concern?  Do a bit of searching
-in our [JIRA issue tracker][] to see if you can find something similar. If not,
-please create a new issue before submitting a pull request unless the change is
-truly trivial, e.g. 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 Contributor License Agreement
-
-If you have not previously done so, please fill out and submit the
-[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
-of the web form is all that is required.
-
-When 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 SpringSource Individual
-    Contributor License Agreement.
-
-You do not need to include your token/id. Please add the statement above to all
-future pull requests as well, simply so the Spring Framework team knows
-immediately that this process is complete.
-
-
-## Create your branch from `master`
-
-At any given time, Spring Framework's `master` branch represents the version
-currently under development. For example, if 3.1.1 was the latest Spring
-Framework release, `master` represents 3.2.0 development, and the `3.1.x`
-branch represents 3.1.2 development.
-
-Create your topic branch to be submitted as a pull request from `master`. The
-Spring team will consider your pull request for backporting to maintenance
-versions (e.g. 3.1.2) on a case-by-case basis; you don't need to worry about
-submitting anything for backporting.
-
-
-## Use short branch names
-
-Branches used when submitting pull requests should preferably be named
-according to JIRA issues, e.g. 'SPR-1234'. Otherwise, use succinct, lower-case,
-dash (-) delimited names, such as 'fix-warnings', 'fix-typo', etc. In
-[fork-and-edit][] cases, the GitHub default 'patch-1' is fine as well. This is
-important, because branch names show up in the merge commits that result from
-accepting pull requests, and should be as expressive and concise as possible.
-
-
-## Mind the whitespace
-
-Please carefully follow the whitespace and formatting conventions already
-present in the framework.
-
-1. Tabs, not spaces
-1. Unix (LF), not dos (CRLF) line endings
-1. Eliminate all trailing whitespace
-1. Wrap Javadoc at 90 characters
-1. Aim to wrap code at 90 characters, but favor readability over wrapping
-1. Preserve existing formatting; i.e. do not reformat code for its own sake
-1. Search the codebase using `git grep` and other tools to discover common
-   naming conventions, etc.
-1. Latin-1 (ISO-8859-1) encoding for Java sources; use `native2ascii` to convert
-   if necessary
-
-
-## Add Apache license header to all new classes
-
-```java
-/*
- * 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.
- * 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 ...;
-```
-
-## Update Apache license header to modified files as necessary
-
-Always check the date range in the license header. For example, if you've
-modified a file in 2012 whose header still reads
-
-```java
- * Copyright 2002-2011 the original author or authors.
-```
-
-then be sure to update it to 2012 appropriately
-
-```java
- * Copyright 2002-2012 the original author or authors.
-```
-
-## Use @since tags for newly-added public API types and methods
-
-e.g.
-
-```java
-/**
- * ...
- *
- * @author First Last
- * @since 3.2
- * @see ...
- */
-```
-
-## Submit JUnit test cases for all behavior changes
-
-Search the codebase to find related unit tests and add additional @Test methods
-within. It is also acceptable to submit test cases on a per JIRA issue basis,
-e.g.
-
-```java
-package org.springframework.beans.factory.support;
-
-/**
- * Unit tests for SPR-8954, in which a custom {@link InstantiationAwareBeanPostProcessor}
- * forces the predicted type of a FactoryBean, effectively preventing retrieval of the
- * bean from calls to #getBeansOfType(FactoryBean.class). The implementation of
- * {@link AbstractBeanFactory#isFactoryBean(String, RootBeanDefinition)} now ensures
- * that not only the predicted bean type is considered, but also the original bean
- * definition's beanClass.
- *
- * @author Chris Beams
- */
-public class Spr8954Tests {
-
-    @Test
-    public void cornerSpr8954() {
-        // ...
-    }
-}
-```
-
-
-## Squash commits
-
-Use `git rebase --interactive`, `git add --patch` and other tools to "squash"
-multiple commits into atomic changes. In addition to the man pages for git,
-there are many resources online to help you understand how these tools work.
-Here is one: http://book.git-scm.com/4_interactive_rebasing.html.
-
-
-## Use real name in git commits
-
-Please configure git to use your real first and last name for any commits you
-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 SpringSource contributor license agreement:
-
-    Author: First Last <user@mail.com>
-
-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 globally via the account admin area GitHub (useful for
-fork-and-edit cases); globally with
-
-    git config --global user.name "First Last"
-    git config --global user.email user@mail.com
-
-or locally for the spring-framework repository only by omitting the '--global'
-flag:
-
-    cd spring-framework
-    git config user.name "First Last"
-    git config user.email user@mail.com
-
-
-## Format commit messages
-
-Please read and follow the [commit guidelines section of Pro Git][].
-
-Most importantly, please format your commit messages in the following way
-(adapted from the commit template in the link above):
-
-    Short (50 chars or less) summary of changes
-
-    More detailed explanatory text, if necessary. Wrap it to about 72
-    characters or so. In some contexts, the first line is treated as the
-    subject of an email and the rest of the text as the body. The blank
-    line separating the summary from the body is critical (unless you omit
-    the body entirely); tools like rebase can get confused if you run the
-    two together.
-
-    Further paragraphs come after blank lines.
-
-     - Bullet points are okay, too
-
-     - Typically a hyphen or asterisk is used for the bullet, preceded by a
-       single space, with blank lines in between, but conventions vary here
-
-    Issue: SPR-1234, SPR-1235
-
-
-1. Use imperative statements in the subject line, e.g. "Fix broken Javadoc link"
-1. Begin the subject line sentence with a capitalized verb, e.g. "Add, Prune,
-   Fix, Introduce, Avoid, etc"
-1. Do not end the subject line with a period
-1. Keep 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
-1. In the body of the commit message, explain how things worked before this
-   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:
-
-https://github.com/SpringSource/spring-framework/commit/08e2669b84ec0faa2f7904441fe39ac70b65b078
-https://github.com/SpringSource/spring-framework/commit/1d9d3e6ff79ce9f0eca03b02cd1df705925575da
-https://github.com/SpringSource/spring-framework/commit/8e0b1c3a5f957af3049cfa0438317177e16d6de6
-https://github.com/SpringSource/spring-framework/commit/b787a68f2050df179f7036b209aa741230a02477
-
-## Run all tests prior to submission
-
-See the [building from source][] section of the README for instructions. Make
-sure that all tests pass prior to submitting your pull request.
-
-
-## Submit your pull request
-
-Subject line:
-
-Follow the same conventions for pull request subject lines as mentioned above
-for commit message subject lines.
-
-In the body:
-
-1. Explain your use case. What led you to submit this change? Why were existing
-    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 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
-the commit message. This is fine, but please also include the items above in the
-body of the request.
-
-
-## Mention your pull request on the associated JIRA issue
-
-Add a comment to the associated JIRA issue(s) linking to your new pull request.
-
-
-## Expect discussion and rework
-
-The Spring team takes a very conservative approach to accepting contributions to
-the framework. This is to keep code quality and stability as high as possible,
-and to keep complexity at a minimum. Your changes, if accepted, may be heavily
-modified prior to merging. You will retain "Author:" attribution for your Git
-commits granted that the bulk of your changes remain intact. You may be asked to
-rework the submission for style (as explained above) and/or substance. Again, we
-strongly recommend discussing any serious submissions with the Spring Framework 
-team _prior_ to engaging in serious development work.
-
-Note that you can always force push (`git push -f`) reworked / rebased commits
-against the branch used to submit your pull request. i.e. you do not 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.springsource.org/browse/SPR
-[spring-framework-contrib]: https://groups.google.com/forum/#!forum/spring-framework-contrib
-[SpringSource CLA form]: https://support.springsource.com/spring_committer_signup
-[fork-and-edit]: https://github.com/blog/844-forking-with-the-edit-button
-[commit guidelines section of Pro Git]: http://progit.org/book/ch5-2.html#commit_guidelines
-[building from source]: https://github.com/SpringSource/spring-framework#building-from-source
@@ -1,96 +1,59 @@
 ## Spring Framework
-The Spring Framework provides a comprehensive programming and configuration
-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 Spring Framework provides a comprehensive programming and configuration 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 [SpringSource organization][] on GitHub for a full list.
+The framework also serves as the foundation for
+[Spring Integration](https://github.com/SpringSource/spring-integration),
+[Spring Batch](https://github.com/SpringSource/spring-batch) and the rest of the Spring
+[family of projects](http://springsource.org/projects). Browse the repositories under the
+[SpringSource organization](https://github.com/SpringSource) on GitHub for a full list.

-[.NET][] and [Python][] variants are available as well.
+[.NET](https://github.com/SpringSource/spring-net) and
+[Python](https://github.com/SpringSource/spring-python) variants are available as well.

 ## Downloading artifacts
-See [downloading Spring artifacts][] for Maven repository information. Unable to
-use Maven or other transitive dependency management tools? See [building a
-distribution with dependencies][].
+Instructions on
+[downloading Spring artifacts](https://github.com/SpringSource/spring-framework/wiki/Downloading-Spring-artifacts)
+via Maven and other build systems are available via the project wiki.

 ## Documentation
-See the current [Javadoc][] and [reference docs][].
+See the current [Javadoc](http://static.springsource.org/spring-framework/docs/current/api)
+and [Reference docs](http://static.springsource.org/spring-framework/docs/current/reference).

 ## Getting 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.
+Check out the [Spring forums](http://forum.springsource.org) and the
+[Spring tag](http://stackoverflow.com/questions/tagged/spring) on StackOverflow.
+[Commercial support](http://springsource.com/support/springsupport) is available too.

 ## Issue Tracking
-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
-simple step-by-step instructions.
+Spring's JIRA issue tracker can be found [here](http://jira.springsource.org/browse/SPR). Think
+you've found a bug? Please consider submitting a reproduction project via the
+[spring-framework-issues](https://github.com/springsource/spring-framework-issues) repository. The
+[readme](https://github.com/springsource/spring-framework-issues#readme) provides simple
+step-by-step instructions.

 ## Building from source
-The Spring Framework uses a [Gradle][]-based build system. In the instructions
-below, [`./gradlew`][] is invoked from the root of the source tree and serves as
-a cross-platform, self-contained bootstrap mechanism for the build. The only
-prerequisites are [Git][] and JDK 1.7+.
-
-### check out sources
-`git clone git://github.com/SpringSource/spring-framework.git`
-
-### compile and test, build all jars, distribution zips and docs
-`./gradlew build`
-
-### install all spring-\* jars into your local Maven cache
-`./gradlew install`
-
-### import sources into your IDE
-Run `./import-into-eclipse.sh` or read `import-into-idea.md` as appropriate.
-
-... and discover more commands with `./gradlew tasks`. See also the [Gradle
-build and release FAQ][].
+Instructions on
+[building Spring from source](https://github.com/SpringSource/spring-framework/wiki/Building-from-source)
+are available via the project wiki.

 ## Contributing
-[Pull requests][] are welcome; see the [contributor guidelines][] for details.
+[Pull requests](http://help.github.com/send-pull-requests) are welcome; you'll be asked to sign our
+contributor license agreement ([CLA](https://support.springsource.com/spring_committer_signup)).
+Trivial changes like typo fixes are especially appreciated (just
+[fork and edit!](https://github.com/blog/844-forking-with-the-edit-button)). For larger changes,
+please search through JIRA for similiar issues, creating a new one if necessary, and discuss your
+ideas with the Spring team.

 ## Staying in touch
-Follow [@springframework][] and its [team members][] on Twitter. In-depth
-articles can be found at the SpringSource [team blog][], and releases are
-announced via our [news feed][].
+Follow [@springframework](http://twitter.com/springframework) and its
+[team members](http://twitter.com/springframework/team/members) on Twitter. In-depth articles can be
+found at the SpringSource [team blog](http://blog.springsource.org), and releases are announced via
+our [news feed](http://www.springsource.org/news-events).

 ## License
-The Spring Framework is released under version 2.0 of the [Apache License][].
-
-[Spring Integration]: https://github.com/SpringSource/spring-integration
-[Spring Batch]: https://github.com/SpringSource/spring-batch
-[family of projects]: http://springsource.org/projects
-[SpringSource organization]: https://github.com/SpringSource
-[.NET]: https://github.com/SpringSource/spring-net
-[Python]: https://github.com/SpringSource/spring-python
-[downloading Spring artifacts]: https://github.com/SpringSource/spring-framework/wiki/Downloading-Spring-artifacts
-[building a distribution with dependencies]: https://github.com/SpringSource/spring-framework/wiki/Building-a-distribution-with-dependencies
-[Javadoc]: http://static.springsource.org/spring-framework/docs/current/javadoc-api
-[reference docs]: http://static.springsource.org/spring-framework/docs/current/spring-framework-reference
-[Spring forums]: http://forum.springsource.org
-[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://springsource.com/support/springsupport
-[Spring Framework JIRA]: http://jira.springsource.org/browse/SPR
-[the lifecycle of an issue]: https://github.com/cbeams/spring-framework/wiki/The-Lifecycle-of-an-Issue
-[spring-framework-issues]: https://github.com/SpringSource/spring-framework-issues#readme
-[readme]: https://github.com/SpringSource/spring-framework-issues#readme
-[Gradle]: http://gradle.org
-[`./gradlew`]: http://vimeo.com/34436402
-[Git]: http://help.github.com/set-up-git-redirect
-[Gradle build and release FAQ]: https://github.com/SpringSource/spring-framework/wiki/Gradle-build-and-release-FAQ
-[Pull requests]: http://help.github.com/send-pull-requests
-[contributor guidelines]: https://github.com/SpringSource/spring-framework/blob/master/CONTRIBUTING.md
-[@springframework]: http://twitter.com/springframework
-[team members]: http://twitter.com/springframework/team/members
-[team blog]: http://blog.springsource.org
-[news feed]: http://www.springsource.org/news-events
-[Apache License]: http://www.apache.org/licenses/LICENSE-2.0
+The Spring Framework is released under version 2.0 of the
+[Apache License](http://www.apache.org/licenses/LICENSE-2.0).
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="build-spring-framework" default="precommit">
+
+	<path id="unit.test.bundles">
+		<pathelement location="../org.springframework.instrument"/>
+		<pathelement location="../org.springframework.instrument.tomcat"/>
+		<pathelement location="../org.springframework.core"/>
+		<pathelement location="../org.springframework.expression"/>
+		<pathelement location="../org.springframework.beans"/>
+		<pathelement location="../org.springframework.aop"/>
+		<pathelement location="../org.springframework.context"/>
+		<pathelement location="../org.springframework.transaction"/>
+		<pathelement location="../org.springframework.oxm"/>
+		<pathelement location="../org.springframework.jms"/>
+		<pathelement location="../org.springframework.jdbc"/>
+		<pathelement location="../org.springframework.web"/>
+		<pathelement location="../org.springframework.orm"/>
+		<pathelement location="../org.springframework.context.support"/>
+		<pathelement location="../org.springframework.aspects"/>
+		<pathelement location="../org.springframework.web.servlet"/>
+		<pathelement location="../org.springframework.web.portlet"/>
+		<pathelement location="../org.springframework.test"/>
+		<pathelement location="../org.springframework.web.struts"/>
+	</path>
+
+	<path id="bundles">
+		<pathelement location="../org.springframework.spring-parent"/>
+		<pathelement location="../org.springframework.asm"/>
+		<path refid="unit.test.bundles" />
+		<pathelement location="../org.springframework.integration-tests"/>
+		<pathelement location="../org.springframework.spring-library"/>
+	</path>
+
+	<property file="${basedir}/../build.properties"/>
+	<import file="${basedir}/package-top-level.xml"/>
+	<import file="${basedir}/publish-top-level.xml"/>
+	<import file="${basedir}/publish-documentation.xml"/>
+	<import file="${basedir}/../spring-build/multi-bundle/default.xml"/>
+
+	<target name="precommit" depends="clean, clean-integration, test"/>
+
+	<presetdef name="javadoc.links">
+		<javadoc>
+			<link href="http://download.oracle.com/javase/6/docs/api"/>
+			<link href="http://download.oracle.com/javaee/6/api"/>
+			<link href="http://aopalliance.sourceforge.net/doc"/>
+			<!-- Caucho Burlap/Hessian -->
+			<link href="http://cglib.sourceforge.net/apidocs"/>
+			<!-- EasyMock -->
+			<link href="http://ehcache.sourceforge.net/apidocs"/>
+			<link href="http://freemarker.sourceforge.net/docs/api/"/>
+			<link href="http://docs.jboss.org/hibernate/core/3.6/javadocs/"/>
+			<!-- iBATIS -->
+			<!-- iText -->
+			<!-- Commons Attributes -->
+			<link href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/"/>
+			<link href="http://jakarta.apache.org/commons/dbcp/apidocs/"/>
+			<link href="http://jakarta.apache.org/commons/fileupload/apidocs/"/>
+			<link href="http://jakarta.apache.org/commons/httpclient/apidocs/"/>
+			<link href="http://jakarta.apache.org/commons/logging/apidocs/"/>
+			<link href="http://jakarta.apache.org/commons/pool/apidocs/"/>
+			<!-- JasperReports -->
+			<!-- JDO -->
+			<!-- JMX -->
+			<!-- JOTM -->
+			<!-- JPA -->
+			<!-- JSF -->
+			<link href="http://junit.sourceforge.net/javadoc_40/"/>
+			<link href="http://logging.apache.org/log4j/docs/api/"/>
+			<link href="http://jakarta.apache.org/regexp/apidocs/"/>
+			<link href="http://jakarta.apache.org/poi/apidocs/"/>
+			<link href="http://portals.apache.org/pluto/portlet-1.0-apidocs/"/>
+			<link href="http://www.quartz-scheduler.org/api/2.1.0/"/>
+			<link href="http://struts.apache.org/struts-doc-1.2.9/api/"/>
+			<link href="http://java.sun.com/javase/6/docs/jre/api/net/httpserver/spec/"/>
+			<link href="http://tiles.apache.org/framework/apidocs/"/>
+			<link href="http://velocity.apache.org/engine/devel/apidocs/"/>
+		</javadoc>
+	</presetdef>
+
+</project>
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="package-bundle">
+
+	<target name="package" depends="ivy.init">
+		<dist-jar/>
+		<src-jar/>
+	</target>
+
+</project>
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="package-library">
+
+	<target name="package" depends="ivy.init">
+		<dist-jar/>
+	</target>
+
+</project>
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="package-top-level">
+
+	<target name="package" description="Creates the release package for this project">
+		<delete dir="${package.output.dir}" quiet="true"/>
+		<mkdir dir="${package.output.dir}"/>
+		<delete file="${package.output.file}" quiet="true"/>
+		<mkdir dir="${artifacts.dir}"/>
+
+		<all-bundles target="package">
+			<property name="package.output.dir" value="${package.output.dir}"/>
+		</all-bundles>
+
+		<ant target="javadoc-api" inheritAll="false">
+			<property name="target.dir" value="${package.docs.dir}"/>
+		</ant>
+
+		<!-- Reference Document START-->
+		<path id="doc.projects">
+			<path location="${basedir}/../spring-framework-reference"/>
+		</path>
+
+		<all-bundles target="doc" buildpathRef="doc.projects"/>
+
+		<delete>
+		  <fileset dir="${basedir}/../spring-framework-reference" includes="**/*.zip"/>
+		</delete>
+
+		<all-bundles target="package" buildpathRef="doc.projects">
+			<property name="package.output.dir" value="${package.output.dir}"/>
+		</all-bundles>
+
+		<!-- Reference Document END-->
+
+		<copy todir="${package.output.dir}">
+			<fileset dir="${basedir}/resources"/>
+		</copy>
+
+		<copy todir="${package.output.dir}/projects">
+			<fileset dir="${basedir}/..">
+				<exclude name="*/target/**"/>
+				<exclude name="integration-repo/**"/>
+				<exclude name="ivy-cache/**"/>
+				<exclude name="spring-build/lib/docbook/**" />
+				<exclude name="**/*OLD*/**"/>
+			</fileset>
+		</copy>
+
+		<replaceregexp match="build.stamp.*\n" replace="" flags="g"
+				file="${package.output.dir}/projects/build.properties"/>
+
+		<replaceregexp match="release.type=.*" replace="release.type=integration" flags="g"
+				file="${package.output.dir}/projects/build.properties"/>
+
+		<zip destfile="${package.output.file}">
+			<zipfileset dir="${package.dir}">
+				<exclude name="${package.basename}/docs/**"/>
+			</zipfileset>
+		</zip>
+		
+		<zip destfile="${artifacts.dir}/${package.basename}-with-docs.zip">
+			<zipfileset dir="${package.dir}"/>
+		</zip>
+
+		<zip destfile="${artifacts.dir}/${package.basename}-dependencies.zip">
+			<zipfileset dir="${basedir}/../ivy-cache/repository">
+				<exclude name="org.apache.velocity/org.apache.velocity.docbookframework.dist/**"/>
+			</zipfileset>
+		</zip>
+		
+	</target>
+
+</project>
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="publish-documentation">
+
+<!-- Main targets -->
+	<target name="publish-documentation" depends="publish-documentation.init">
+		<sshexec host="static.springsource.org" username="${username}" keyfile="${key.file}" passphrase="${passphrase}"
+				command="rm -rf /opt/www/domains/springframework.org/www/htdocs/spring/docs/${bundle.version}"/>
+		<sshexec host="static.springsource.org" username="${username}" keyfile="${key.file}" passphrase="${passphrase}"
+				command="mkdir /opt/www/domains/springframework.org/www/htdocs/spring/docs/${bundle.version}"/>
+
+		<scp remoteToDir="${username}@static.springsource.org:/opt/www/domains/springframework.org/www/htdocs/spring/docs/${bundle.version}"
+				keyfile="${key.file}" passphrase="${passphrase}" sftp="true" verbose="true">
+			<fileset dir="${package.output.dir}">
+				<include name="changelog.txt" />
+				<include name="license.txt" />
+				<include name="readme.txt" />
+			</fileset>
+			<fileset dir="${package.docs.dir}" />
+		</scp>
+
+		<sshexec host="static.springsource.org" username="${username}" keyfile="${key.file}" passphrase="${passphrase}"
+				command="rm -f /opt/www/domains/springframework.org/www/htdocs/spring/docs/3.1.x ; ln -s /opt/www/domains/springframework.org/www/htdocs/spring/docs/${bundle.version} /opt/www/domains/springframework.org/www/htdocs/spring/docs/3.1.x"/>
+	</target>
+
+<!-- Other targets -->
+	<target name="publish-documentation.init">
+		<fail message="The 'username' property must be set">
+			<condition>
+				<not>
+					<isset property="username"/>
+				</not>
+			</condition>
+		</fail>
+		<fail message="The 'key.file' property must be set">
+			<condition>
+				<not>
+					<isset property="key.file"/>
+				</not>
+			</condition>
+		</fail>
+		<fail message="The 'passphrase' property must be set">
+			<condition>
+				<not>
+					<isset property="passphrase"/>
+				</not>
+			</condition>
+		</fail>
+	</target>
+
+</project>
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="publish-top-level" xmlns:aws="antlib:org.springframework.build.aws">
+
+	<target name="publish" depends="publish-package, publish-multi-bundle.publish"
+			description="Publish package, Ivy, and Maven artifacts"/>
+
+	<target name="publish-package" depends="aws.init">
+		<checksum file="${package.output.file}" algorithm="sha1"/>
+		<checksum file="${artifacts.dir}/${package.basename}-with-docs.zip" algorithm="sha1"/>
+		<checksum file="${artifacts.dir}/${package.basename}-dependencies.zip" algorithm="sha1"/>
+		
+		<aws:s3 accessKey="${accessKey}" secretKey="${secretKey}">
+			<upload bucketName="dist.${bucket.basename}" file="${package.output.file}"
+					toFile="${adjusted.release.type}/${project.key}/${package.file.name}" publicRead="true">
+				<metadata name="project.name" value="Spring Framework"/>
+				<metadata name="release.type" value="${release.type}"/>
+				<metadata name="bundle.version" value="${bundle.version}"/>
+				<metadata name="package.file.name" value="${package.file.name}"/>
+			</upload>
+			<upload bucketName="dist.${bucket.basename}" file="${package.output.file}.sha1"
+					toFile="${adjusted.release.type}/${project.key}/${package.file.name}.sha1" publicRead="true"/>
+
+			<upload bucketName="dist.${bucket.basename}" file="${artifacts.dir}/${package.basename}-with-docs.zip"
+					toFile="${adjusted.release.type}/${project.key}/${package.basename}-with-docs.zip" publicRead="true">
+				<metadata name="project.name" value="Spring Framework"/>
+				<metadata name="release.type" value="${release.type}"/>
+				<metadata name="bundle.version" value="${bundle.version}"/>
+				<metadata name="package.file.name" value="${package.basename}-with-docs.zip"/>
+			</upload>
+			<upload bucketName="dist.${bucket.basename}" file="${artifacts.dir}/${package.basename}-with-docs.zip.sha1"
+					toFile="${adjusted.release.type}/${project.key}/${package.basename}-with-docs.zip.sha1" publicRead="true"/>
+
+			<upload bucketName="dist.${bucket.basename}" file="${artifacts.dir}/${package.basename}-dependencies.zip"
+					toFile="${adjusted.release.type}/${project.key}/${package.basename}-dependencies.zip" publicRead="true">
+				<metadata name="project.name" value="Spring Framework"/>
+				<metadata name="release.type" value="${release.type}"/>
+				<metadata name="bundle.version" value="${bundle.version}"/>
+				<metadata name="package.file.name" value="${package.basename}-dependencies.zip"/>
+			</upload>
+			<upload bucketName="dist.${bucket.basename}" file="${artifacts.dir}/${package.basename}-dependencies.zip.sha1"
+					toFile="${adjusted.release.type}/${project.key}/${package.basename}-dependencies.zip.sha1" publicRead="true"/>
+		</aws:s3>
+	</target>
+</project>
@@ -0,0 +1,42 @@
+This is where the master build that creates releases of Spring Framework resides.
+The build system is based on spring-build, which is linked in using an SVN
+external to https://src.springframework.org/svn/spring-build.
+
+Build Pre-requisites:
+- javac 1.6 or > must be in your system path
+- ant 1.7 or > must be in your system path
+- set ANT_OPTS as follows (to avoid out of memory errors):
+    ANT_OPTS="-XX:MaxPermSize=1024m -Xmx1024m -Dtest.vm.args='-XX:MaxPermSize=512m -Xmx1024m'"
+
+USERS
+- To build all Spring Framework projects, including samples:
+
+    1. From this directory, run:
+       ant
+
+- To install the built artifacts into your local Maven cache:
+
+    1. From this directory, run:
+       ant install-maven
+
+- For a complete tutorial, see:
+
+       http://blog.springsource.com/2009/03/03/building-spring-3
+
+
+DEVELOPERS
+- To build a new Spring Framework distribution for release:
+
+  1. Update the files containing the version number to reflect the new release
+     version, if necessary.
+
+         build.properties
+         build-spring-framework/resources/readme.txt
+         spring-framework/src/spring-framework-reference.xml
+
+  2. From this directory, run:
+
+         ant jar package
+
+     The release archive will be created and placed in:
+         target/artifacts
@@ -1,207 +1,120 @@
 SPRING FRAMEWORK CHANGELOG
-===========================
+==========================
 http://www.springsource.org


-Changes in version 3.2 RC2 (2012-11-27)
---------------------------------------
+Changes in version 3.1.4 (2013-01-23)
+-------------------------------------

 * overhauled non-void JavaBean write method support (SPR-10029)
+* SpEL support for static finals on interfaces (SPR-10125)
+* BridgeMethodResolver properly handles bridge methods in interfaces (SPR-9330)
+* LocalVariableTableParameterNameDiscoverer works for bridge methods as well (SPR-9429)
 * CachedIntrospectionResults uses full WeakReference for any non-safe ClassLoader arrangement (SPR-10028)
+* CachedIntrospectionResults.clearClassLoader(null) removes cached classes for the system class loader (SPR-9189)
 * DefaultListableBeanFactory avoids wide/interleaved metadata locks to avoid deadlock potential (SPR-10020)
-* DefaultListableBeanFactory avoids singletonObjects lock wherever possible for non-singleton performance (SPR-9819)
-* DefaultListableBeanFactory doesn't cache for autowireBean calls anymore, avoiding ClassLoader leaks (SPR-8956)
-* Java 5 Closeable and Java 7 AutoCloseable automatically detected as destroy methods (SPR-10034)
-* @Bean destroy method inference not applying for DisposableBean implementers (avoiding double destruction)
-* @Lazy and @DependsOn not marked as @Inherited anymore - only supported on actual bean types (SPR-9589, SPR-9476)
-* AsyncAnnotationBean/MethodValidation/PersistenceExceptionTranslationPostProcessor cache eligible beans (SPR-7328)
-* ConfigurableApplicationContext, LobCreator and Client/ServerHttpResponse implement Closeable for Java 7 (SPR-9962)
-* spring-jms-3.2.xsd declares former nmtoken attributes as string, allowing for placeholders (SPR-9597)
-* introduced TransactionAwareCacheManagerProxy for cache put synchronization with Spring transactions (SPR-9966)
-* added "transactionAware" bean property to EhCacheCacheManager and JCacheCacheManager (SPR-9966)
-* moved "cache.ehcache" and "cache.jcache" packages from spring-context to spring-context-support module
-* deprecated "scheduling.backportconcurrent" package in favor of native JDK 6 "scheduling.concurrent" support
-* deprecated Oracle OC4J support (OC4JJtaTransactionManager, OC4JLoadTimeWeaver) in favor of Oracle WebLogic
-* deprecated ExpressionEvaluationUtils, turning off Spring's own JSP expression support in favor of JSP 2.0
-* deprecated EJB 2.x implementation class hierarchy in "ejb.support" package
-* deprecated DefaultAnnotationHandlerMapping and AnnotationMethodHandlerAdapter/ExceptionResolver (SPR-10005)
-* Hibernate 4 support independently compiled against Hibernate 4.1, avoiding the use of reflection (SPR-10039)
-* added integration with Tiles 3 (SPR-8825)
+* fixed CGLIB proxy class leaks through further equals/hashCode implementations in Spring AOP pointcuts (SPR-8008)
+* ConfigurationClassPostProcessor consistently uses ClassLoader, not loading core JDK classes via ASM (SPR-10058)
+* MessageSourceResourceBundle overrides JDK 1.6 containsKey method, avoiding NPE in getKeys (SPR-10136)
+* SpringBeanAutowiringInterceptor eagerly releases BeanFactory if post-construction fails (SPR-10013)
+* added "exposeAccessContext" flag JndiRmiClientInterceptor/ProxyFactoryBean (for WebLogic; SPR-9428)
+* MBeanExporter does not log warnings for manually unregistered MBeans (SPR-9451)
+* AbstractCacheManager accepts no caches defined, allowing for EHCache default cache setup (SPR-7955)
+* reintroduced "mode" and "proxy-target-class" attributes in spring-task-3.1.xsd (SPR-10177)
+* improved defensiveness of JDBC 3.0 ParameterMetaData calls for parameter type determination (SPR-10084)
+* JpaTransactionManager etc finds default EntityManagerFactory in parent context as well (SPR-10160)
+* tx timeouts for JPA translate to "javax.persistence.query.timeout" only (for EclipseLink compatibility; SPR-10068)
+* DefaultMessageListenerContainer allows for concurrent subscription consumers on WebLogic/ActiveMQ (SPR-10037)
+* DefaultMessageListenerContainer clears resources of paused tasks when shutting down after stop (SPR-10092)
+* JmsTemplate uses configured receiveTimeout if shorter than remaining transaction timeout (SPR-10109)
+* added MappingJackson2MessageConverter for JMS (SPR-10099)
+* ResourceDatabasePopulator explicitly closes its LineNumberReader (SPR-9912)
+* MimeMessageHelper encodes attachment filename if not ASCII compliant (SPR-9258)
+* FreeMarkerConfigurationFactory properly supports TemplateLoaders when recreating Configurations (SPR-9389)
+* SpringContextResourceAdapter implements equals/hashCode according to the JCA 1.5 contract (SPR-9162)
+* ContextLoader properly detects pre-refreshed WebApplicationContext (SPR-9996)
+* AbstractCachingViewResolver uses a cache limit of 1024 by default, avoiding overflow for redirect URLs (SPR-10065)
+* fixed HierarchicalUriComponents equals implementation (SPR-10088)
+* MockHttpServletRequest's getParameter(Values) returns null for null parameter name (SPR-10192)
+* MockHttpServletResponse's getHeaderNames declares Collection instead of Set for Servlet 3.0 compatibility (SPR-9885)
+* ResourcePropertySource supports JDK 5-style Properties XML (SPR-9896)


-Changes in version 3.2 RC1 (2012-11-04)
---------------------------------------
+Changes in version 3.1.3 (2012-10-31)
+-------------------------------------

-* added "getApplicationName()" method to ApplicationContext interface
-* introduced LiveBeansView MBean and LiveBeansViewServlet (SPR-9662)
-* ResourceBundleMessageSource supports "defaultEncoding", "fallbackToSystemLocale", "cacheSeconds" (SPR-7392)
-* BeanWrapper does not fall back to String constructor if ConversionService attempt failed before (SPR-9865)
-* @Autowired, @Value, and qualifiers may be used as meta-annotations for custom injection annotations (SPR-9890)
-* @DateTimeFormat may now be used as a meta-annotation for custom formatting annotations
-* allow replaced-method 'arg-type' matches against element body as well as 'match' attribute (SPR-9812)
-* fixed potential race condition in concurrent calling of autowired methods on a prototype bean (SPR-9806)
-* cancel on a Future returned by a TaskScheduler works reliably (SPR-9821)
-* LoadTimeWeaverAware beans are consistently being created early for JPA weaving to work reliably (SPR-9857)
-* @ManagedResource supports placeholder resolution on all of its String properties (SPR-8244)
-* Spring-backed DataSources consistently implement JDBC 4.0's Wrapper interface (SPR-9770, SPR-9856)
-* optimized ResourceDatabasePopulator to work around JDK 1.7 substring performance regression (SPR-9781)
-* JdbcTestUtils no longer interprets SQL comments as statements (SPR-9593)
-* JPA persistence.xml files may use jar-file entries relative to the unit root (as per the JPA spec; SPR-9797)
-* added "jtaDataSource" property to JPA LocalContainerEntityManagerFactoryBean (for default units; SPR-9883)
-* Hibernate 4 LocalSessionFactoryBuilder sets thread context ClassLoader (for JBoss 7 compatibility; SPR-9846)
-* HttpComponentsHttpInvokerRequestExecutor uses HttpComponents 4.2 to explicitly release connections (SPR-9833)
-* UriComponentsBuilder is capable of handling opaque URIs as well (SPR-9798)
-* CookieGenerator supports "cookieHttpOnly" flag for Servlet 3.0 (SPR-9794)
-* added Spring MVC Test framework (SPR-9859, SPR-7951)
-* introduced support for loading a WebApplicationContext in the TestContext framework (SPR-5243)
-* introduced support for session & request scoped beans in the TestContext framework (SPR-4588)
-* introduced support for setting locales in MockHttpServletRequest (SPR-9724)
-* improved regular expression for parsing query params (SPR-9832)
-* added mock implementations of Http[Input|Output]Message
-* MediaType's include method now recognizes wildcards in media types with a suffix (SPR-9841)
-* added support for wildcard media types in AbstractView and ContentNegotiationViewResolver (SPR-9807)
-* added support for opaque URIs in UriComponentsBuilder (SPR-9798)
-* added ObjectToStringHttpMessageConverter that delegates to a ConversionService (SPR-9738)
-* fixed NullPointerException in AbstractMessageConverterMethodProcessor (SPR-9868)
-* fixed issue in AnnotationMethodHandlerExceptionResolver (SPR-9209)
-* added CallableProcessingInterceptor and DeferredResultProcessingInterceptor
-* added Jackson2ObjectMapperBeanFactory (SPR-9739)
-* the Jackson message converters now include "application/*+json" in supported media types (SPR-7905)
-* DispatcherPortlet uses a forward for rendering a view as resource response (SPR-9876)
-* prevent duplicate @Import processing and ImportBeanDefinitionRegistrar invocation (SPR-9925)
-* throw AopInvocationException on advice returning null for primitive type (SPR-4675)
-* resolve Collection element types during conversion (SPR-9257)
-* allow SpEL reserved words in type package names (SPR-9862)
-* provide alternative message code resolver styles (SPR-9707)
-* support conversion from Enum Interface (SPR-9692)
-* bypass conversion when possible (SPR-9566)
-* extend conditional conversion support (SPR-9928)
-* introduce @EnableMBeanExport (SPR-8943)
-* add StringToUUIDConverter (SPR-9765)
-* allow MapToMap conversion even without a default constructor (SPR-9284)
-* allow SpEL to resolve getter method against object of type Class (SPR-9017)
-* prevent memory leaks with @Configuration beans (SPR-9851)
-* support inferred base package for @ComponentScan (SPR-9586)
-* sort candidate @AspectJ methods deterministically (SPR-9729)
-* improve SimpleStreamingClientHttpRequest performance (SPR-9530)
-* added UnknownHttpStatusCodeException (SPR-9406)
-* support for custom global Joda DateTimeFormatters (SPR-7121)
-* support DateTimeFormat annotation without Joda (SPR-6508)
-* use concurrent cache to improve performance of GenericTypeResolver (SPR-8701)
-* cache and late resolve annotations on bean properties to improve performance (SPR-9166)
-* allow PropertyResolver implementations to ignore unresolvable ${placeholders} (SPR-9569)
+* fixed cache handling for JNLP connections
+* LinkedCaseInsensitiveMap checks for uniqueness of case-insensitive keys now
+* ResourceBundleMessageSource supports "defaultEncoding", "fallbackToSystemLocale", "cacheSeconds"
+* BeanWrapper does not fall back to String constructor if ConversionService attempt failed before
+* @Import'ed configuration classes get properly registered in case of same class name
+* @Autowired-driven ObjectFactory/Provider resolution works in non-singleton beans as well
+* @Resource processing properly works with scoped beans and prototypes again
+* allow replaced-method 'arg-type' matches against element body as well as 'match' attribute
+* fixed potential race condition in concurrent calling of autowired methods on a prototype bean
+* cancel on a Future returned by a TaskScheduler works reliably
+* LoadTimeWeaverAware beans are consistently being created early for JPA weaving to work reliably
+* Spring-backed DataSources consistently implement JDBC 4.0's Wrapper interface
+* optimized ResourceDatabasePopulator to work around JDK 1.7 substring performance regression
+* deprecated SimpleJdbcTestUtils in favor of JdbcTestUtils
+* introduced "countRowsInTableWhere()" and "dropTables()" in JdbcTestUtils
+* same-named unit from persistence.xml overrides in case of conflict with default unit
+* JPA persistence.xml files may use jar-file entries relative to the unit root (as per the JPA spec)
+* added "jtaDataSource" property to JPA LocalContainerEntityManagerFactoryBean (for default units)
+* Hibernate 4 LocalSessionFactoryBuilder sets thread context ClassLoader (for JBoss 7 compatibility)
+* Jaxb2Marshaller performs proper "supports" check for scanned packages
+* media types in HTTP Accept headers can be parsed with single quotes (-> Android 2.x)
+* MediaType's include method now recognizes wildcards in media types with a suffix
+* added support for recognizing wildcards in media types with a suffix
+* UriComponentsBuilder is capable of handling opaque URIs as well
+* CookieGenerator supports "cookieHttpOnly" flag for Servlet 3.0
+* HttpComponentsHttpInvokerRequestExecutor explicitly releases connection on HttpComponents 4.2
+* improved no-match handling for @RequestMapping methods
+* dynamic return value types for @MVC methods
+* fixed issue with resolution of WebDataBinder argument
+* fixed issue with resolving Errors controller argument
+* now decoding target parameters prior to saving a FlashMap
+* prevent response updates if @ResponseStatus has a reason
+* improved regex for parsing query params
+* optimized use of AntPathStringMatcher
+* optimized use of HandlerMethod and subclasses
+* fixed issue in message conversion where producible and acceptable headers are equally specific
+* fixed NullPointerException in AbstractMessageConverterMethodProcessor
+* fixed side effect from caching in AnnotationMethodHandlerExceptionResolver
+* DispatcherPortlet uses a forward for rendering a view as resource response
+* fixed Portlet request mapping priorities in cross-controller case


-Changes in version 3.2 M2 (2012-09-11)
--------------------------------------
+Changes in version 3.1.2 (2012-07-09)
+-------------------------------------

-* inlined ASM 4.0 into spring-core, removed spring-asm subproject and jar (SPR-9669)
-* inlined CGLIB 3.0 into spring-core, eliminating external dependency (SPR-9669)
-* spring-test module now depends on junit:junit-dep (SPR-6966)
-* SpEL now supports method invocations on integers (SPR-9612)
-* SpEL now supports case-insensitive null literals in expressions (SPR-9613)
-* SpEL now supports symbolic boolean operators for OR and AND (SPR-9614)
-* SpEL now supports nested double quotes in expressions (SPR-9620)
-* SpEL now throws an ISE if a MethodFilter is registered against custom resolvers (SPR-9621)
-* now using BufferedInputStream in SimpleMetaDataReader to double performance (SPR-9528)
-* fixed cache handling for JNLP connections (SPR-9547)
-* now inferring return type of generic factory methods (SPR-9493)
-* added Field context variant to TypeConverter interface in beans module
-* @Value injection works in combination with formatting rules such as @DateTimeFormat (SPR-9637)
-* @Autowired-driven ObjectFactory/Provider resolution works in non-singleton beans as well (SPR-9181)
-* @Resource processing properly works with scoped beans and prototypes again (SPR-9627)
-* introduced "repeatCount" property in Quartz SimpleTriggerFactoryBean (SPR-9521)
-* introduced "jtaTransactionManager" property in Hibernate 4 LocalSessionFactoryBean/Builder (SPR-9480)
-* now raising RestClientException instead of IllegalArgumentException for unknown status codes
-* introduced JacksonObjectMapperFactoryBean for configuring a Jackson ObjectMapper in XML
-* introduced ContentNegotiationManager/ContentNegotiationStrategy for resolving requested media types
-* introduced support for content negotiation options in MVC namespace and MVC Java config
-* added ContentNegotiationManagerFactoryBean (SPR-8420)
-* introduced support for the HTTP PATCH method in Spring MVC and RestTemplate (SPR-7985)
-* enabled smart suffix pattern matching in @RequestMapping methods (SPR-7632)
-* introduced "defaultCharset" property in StringHttpMessageConverter (SPR-9487)
-* introduced @ExceptionResolver annotation for detecting classes with @ExceptionHandler methods
-* moved RSS/Atom message converter registration ahead of Jackson/JAXB2
-* now handling BindException in DefaultHandlerExceptionResolver
-* now setting "javax.servlet.error.exception" in DefaultHandlerExceptionResolver (SPR-9653)
-* added ResponseEntityExceptionHandler alternative to DefaultHandlerExceptionResolver (SPR-9290)
-* now using reflection to instantiate StandardServletAsyncWebRequest
-* fixed issue with forward before async request processing
-* DeferredResult type is now parameterized
-* added async options to MVC namespace and Java config (SPR-9694)
-* refactored Spring MVC async support (SPR-9433)
-* media types in HTTP Accept headers can be parsed with single quotes (-> Android 2.x) (SPR-8917)
-* DispatcherPortlet no longer forwards event exceptions to the render phase by default (SPR-9287)
-* fixed Portlet request mapping priorities in cross-controller case (SPR-9303, SPR-9605)
-* introduced exclude patterns for mapped interceptors in MVC namespace and MVC Java config
-* introduced support for ApplicationContextInitializers in the TestContext framework (SPR-9011)
-* introduced support for named dispatchers in MockServletContext (SPR-9587)
-* introduced support for single, unqualified tx manager in the TestContext framework (SPR-9645)
-* introduced support for TransactionManagementConfigurer in the TestContext framework (SPR-9604)
-* introduced MockEnvironment in the spring-test module (SPR-9492)
-* deprecated SimpleJdbcTestUtils in favor of JdbcTestUtils (SPR-9235)
-* introduced "countRowsInTableWhere()" and "dropTables()" in JdbcTestUtils (SPR-9235)
-* introduced JdbcTemplate in tx base classes in the TestContext framework (SPR-8990)
-* introduced "countRowsInTableWhere()" and "dropTables()" in tx base test classes (SPR-9665)
-* introduced support for @ComponentScan base package inference (SPR-9586)
-* now building, testing and publishing against JDK7, maintaining compat with JDKs 5&6 (SPR-9715)
-* added support for filter registrations in AbstractDispatcherServletInitializer (SPR-9696)
-* improved no-match handling for @RequestMapping methods (SPR-9603)
-* added support for matrix variables (SPR-5499, SPR-7818)
-* added support generic types in @RequestBody arguments (SPR-9570)
-* added support for generic types in the RestTemplate (SPR-7023)
-* added fix to decode target parameters prior to saving a FlashMap (SPR-9657)
-* now allowing an Errors argument after @RequestBody and @RequestPart (SPR-7114)
-* introduced @ControllerAdvice annotation (SPR-9112)
-* added exclude patterns for mapped interceptors (SPR-6570)
-* now ignoring parse errors in HttpPutFormContentFilter (SPR-9769)
-* optimized performance of HandlerMethod (SPR-9747, SPR-9748)
-* optimized performance of AntPathStringMatcher (SPR-9749)
-* added support for Filters/Servlet invocation in MockFilterChain (SPR-9745)
-
-
-Changes in version 3.2 M1 (2012-05-28)
--------------------------------------
-
-* upgrade to AspectJ 1.6.12, JUnit 4.10, TestNG 6.5.2
-* Servlet 3.0-based async support
-* HttpMessageConverter and View types compatible with Jackson 2.0
-* better handling on failure to parse invalid 'Content-Type' or 'Accept' headers
-* handle a controller method's return value based on the actual returned value (vs declared type)
-* fix issue with combining identical controller and method level request mapping paths
-* fix concurrency issue in AnnotationMethodHandlerExceptionResolver
-* fix case-sensitivity issue with some containers on access to 'Content-Disposition' header
-* fix issue with encoded params in UriComponentsBuilder
-* add pretty print option to Jackson HttpMessageConverter and View types
-* translate IOException from Jackson to HttpMessageNotReadableException
-* fix issue with resolving Errors controller method argument
-* implement InitializingBean in RequestMappingHandlerMapping to detect controller methods
+* removed INDEX.LIST entries from Spring jar META-INF dirs
+* fixed OSGi metadata for optional "javax.inject" package import
+* fixed AbstractResource's InputStream-based "contentLength()" implementation
+* fixed MutablePropertySources "get" implementation to correctly return null if not found
+* fixed @PropertySource placeholder resolution to apply to all specified values
+* JDBC parameter binding uses JDBC 3.0 ParameterMetaData (if available) for type determination
+* added "jtaTransactionManager" property to Hibernate 4 LocalSessionFactoryBean/Builder
+* EhCacheFactoryBean applies listeners and enabled/disabled flags to existing cache regions as well
+* added "repeatCount" bean property to Quartz SimpleTriggerFactoryBean
+* support executor qualification with @Async#value
+* ServletContextResource's getFile implementation falls back to getRealPath for non-existent files
+* fixed StandardServletMultipartResolver compatibility with Resin (only deleting actual file parts)
+* fixed RequestConditionHolder to return null when no match is found
+* fixed concurrency issue in AnnotationMethodHandlerExceptionResolver
+* fixed issue with parsing invalid Content-Type or Accept headers
+* added "defaultCharset" property to StringHttpMessageConverter
+* added Jackson 2 HttpMessageConverter and View types
+* translate IOException on EOF from Jackson to HttpMessageNotReadableException
 * fix content negotiation issue when sorting selected media types by quality value
-* prevent further writing to the response when @ResponseStatus contains a reason
-* deprecate HttpStatus codes 419, 420, 421
-* support access to all URI vars via @PathVariable Map<String, String>
-* add "excludedExceptions" property to SimpleUrlHandlerMapping
-* add CompositeRequestCondition for use with multiple custom request mapping conditions
-* add ability to configure custom MessageCodesResolver through the MVC Java config
-* add option in MappingJacksonJsonView for setting the Content-Length header
-* decode path variables when url decoding is turned off in AbstractHandlerMapping
-* add required flag to @RequestBody annotation
-* Jaxb2Marshaller performs proper "supports" check for scanned packages (SPR-9152)
-* add convenient WebAppInitializer base classes (SPR-9300)
-* support executor qualification with @Async#value (SPR-6847)
-* support initial delay attribute for scheduled tasks (SPR-7022)
-* cache by-type lookups in DefaultListableBeanFactory (SPR-6870)
-* merge rather than add URI vars to data binding values (SPR-9349)
-* support not (!) operator for profile selection (SPR-8728)
-* fix regression in ClassPathResource descriptions (SPR-9413)
-* improve documentation of @Bean 'lite' mode (SPR-9401)
-* improve documentation of annotated class support in the TestContext framework (SPR-9401)
-* document support for JSR-250 lifecycle annotations in the TestContext framework (SPR-4868)
-* improve dependency management for spring-test (SPR-8861)
-* fix MultipartResolver Resin compatibility (SPR-9299)
-* handle non-existent files in ServletContextResource (SPR-8461)
-* apply cache settings consistently in EhCacheFactoryBean (SPR-9392)
-* initial support for JCache (JSR-107) compliant cache providers (SPR-8774)
+* raise RestClientException instead of IllegalArgumentException for unknown status codes
+* discover controllers based on type-level @RequestMapping in new @MVC support classes
+* fixed issue with suffix pattern in AnnotationMethodHandlerAdapter
+* merge rather than add URI vars in ExtendedServletRequestDataBinder
+* raise RestClientException for unknown HTTP status codes
+* fixed issue with encoded params in UriComponentsBuilder
+* XStreamMarshaller converts StreamException to Spring exception in case of unmarshalling an empty stream
+* corrected DispatcherPortlet behavior to not forward event exceptions to the render phase by default


 Changes in version 3.1.1 (2012-02-16)
@@ -200,21 +200,20 @@
   See the License for the specific language governing permissions and
   limitations under the License.

-=======================================================================
+=======================================================================   

-SPRING FRAMEWORK ${version} SUBCOMPONENTS:
+SPRING FRAMEWORK 3.1 SUBCOMPONENTS: 

-Spring Framework ${version} includes a number of subcomponents
-with separate copyright notices and license terms. The product that
-includes this file does not necessarily use all the open source
+Spring Framework 3.1 includes a number of subcomponents with
+separate copyright notices and license terms.  The product that 
+includes this file does not necessarily use all the open source 
 subcomponents referred to below. Your use of the source
 code for these subcomponents is subject to the terms and
-conditions of the following licenses.
+conditions of the following licenses. 

+>>> asm-2.2.3:

->>> ASM 4.0 (org.ow2.asm:asm:4.0, org.ow2.asm:asm-commons:4.0):
-
-Copyright (c) 2000-2011 INRIA, France Telecom
+Copyright (c) 2000-2005 INRIA, France Telecom
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
@@ -244,36 +243,19 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 THE POSSIBILITY OF SUCH DAMAGE.

-Copyright (c) 1999-2009, OW2 Consortium <http://www.ow2.org/>
+Copyright (c) 1999-2009, OW2 Consortium <http://www.ow2.org/>	
+		
+=======================================================================   

-
->>> CGLIB 3.0 (cglib:cglib:3.0):
-
-Per the LICENSE file in the CGLIB JAR distribution downloaded from
-http://sourceforge.net/projects/cglib/files/cglib3/3.0/cglib-3.0.jar/download,
-CGLIB 3.0 is licensed under the Apache License, version 2.0, the text of which
-is included above.
-
-
-=======================================================================
-
-To the extent any open source subcomponents are licensed under the EPL and/or
-other similar licenses that require the source code and/or modifications to
-source code to be made available (as would be noted above), you may obtain a
-copy of the source code corresponding to the binaries for such open source
-components and modifications thereto, if any, (the "Source Files"), by
-downloading the Source Files from http://www.springsource.org/download, or by
-sending a request, with your name and address to:
-
-    VMware, Inc., 3401 Hillview Avenue
-    Palo Alto, CA 94304
-    United States of America
-
-or email info@vmware.com.  All such requests should clearly specify:
-
-    OPEN SOURCE FILES REQUEST
-    Attention General Counsel
-
-VMware shall mail a copy of the Source Files to you on a CD or equivalent
-physical medium. This offer to obtain a copy of the Source Files is valid for
-three years from the date you acquired this Software product.
+To the extent any open source subcomponents are licensed under the EPL and/or other 
+similar licenses that require the source code and/or modifications to 
+source code to be made available (as would be noted above), you may obtain a 
+copy of the source code corresponding to the binaries for such open source 
+components and modifications thereto, if any, (the "Source Files"), by 
+downloading the Source Files from http://www.springsource.org/download, 
+or by sending a request, with your name and address to: VMware, Inc., 3401 Hillview 
+Avenue, Palo Alto, CA 94304, United States of America or email info@vmware.com.  All 
+such requests should clearly specify:  OPEN SOURCE FILES REQUEST, Attention General 
+Counsel.  VMware shall mail a copy of the Source Files to you on a CD or equivalent 
+physical medium.  This offer to obtain a copy of the Source Files is valid for three 
+years from the date you acquired this Software product.
@@ -0,0 +1,9 @@
+Spring Framework 3.1
+Copyright (c) 2002-2011 SpringSource, a division of VMware, Inc.
+
+This product is licensed to you under the Apache License, Version 2.0 (the "License").
+You may not use this product except in compliance with the License.
+
+This product may include a number of subcomponents with separate copyright notices and
+license terms. Your use of the source code for the these subcomponents is subject to
+the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
@@ -0,0 +1,26 @@
+SPRING FRAMEWORK 3.1.4 (January 2013)
+-------------------------------------
+http://www.springsource.org
+
+1. INTRODUCTION
+
+Spring Framework 3.1 builds on the Spring Framework 3.0 foundation with
+a focus on Java-based application configuration and MVC enhancements.
+
+2. RELEASE NOTES
+
+This release comes with complete reference documentation. For further
+details, consult the provided javadoc for specific packages and classes.
+
+3. DISTRIBUTION JAR FILES
+
+The Spring Framework module jar files can be found in the 'dist'
+directory. Note that this release does not contain a 'spring.jar' file
+anymore, in contrast to previous Spring generations. Furthermore, the jar
+file names now follow bundle repository conventions.
+
+4. GETTING STARTED
+
+Please consult the blog examples at http://blog.springsource.com as well
+as sections of interest in the reference documentation. Sample
+applications and related material are provided as separate downloads.
@@ -1,864 +0,0 @@
-import org.gradle.plugins.ide.eclipse.model.ProjectDependency
-
-buildscript {
-    repositories {
-        maven { url 'http://repo.springsource.org/plugins-release' }
-    }
-    dependencies {
-        classpath 'org.springframework.build.gradle:docbook-reference-plugin:0.2.1'
-    }
-}
-
-configure(allprojects) {
-    ext.aspectjVersion = '1.6.12'
-    ext.hsqldbVersion='1.8.0.10'
-    ext.junitVersion = '4.11.20120805.1225' // temporary use of snapshot; spring-test
-                                            // still builds against on 4.10
-    ext.gradleScriptDir = "${rootProject.projectDir}/gradle"
-
-    apply plugin: 'java'
-    apply plugin: 'eclipse'
-    apply plugin: 'idea'
-    apply from: "${gradleScriptDir}/ide.gradle"
-
-    group = 'org.springframework'
-
-    sourceCompatibility=1.5
-    targetCompatibility=1.5
-
-    [compileJava, compileTestJava]*.options*.compilerArgs = ['-Xlint:none']
-
-    sourceSets.test.resources.srcDirs = ['src/test/resources', 'src/test/java']
-
-    test.systemProperty("java.awt.headless", "true")
-
-    repositories {
-        maven { url "http://repo.springsource.org/libs-release" }
-        maven { url "http://repo.springsource.org/ebr-maven-external" }
-    }
-
-    dependencies {
-        testCompile "org.hamcrest:hamcrest-all:1.3"
-        testCompile "org.easymock:easymock:2.5.1"
-    }
-}
-
-configure(subprojects - project(":spring-test")) {
-    dependencies {
-        testCompile ("junit:junit-dep:${junitVersion}") {
-            exclude group: 'org.hamcrest', module: 'hamcrest-core'
-        }
-    }
-}
-
-configure(subprojects) { subproject ->
-    apply from: "${gradleScriptDir}/publish-maven.gradle"
-
-    jar {
-        manifest.attributes['Created-By'] =
-            "${System.getProperty('java.version')} (${System.getProperty('java.specification.vendor')})"
-        manifest.attributes['Implementation-Title'] = subproject.name
-        manifest.attributes['Implementation-Version'] = subproject.version
-
-        from("${rootProject.projectDir}/src/dist") {
-            include "license.txt"
-            include "notice.txt"
-            into "META-INF"
-            expand(copyright: new Date().format('yyyy'), version: project.version)
-        }
-    }
-
-    javadoc {
-        options.memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PROTECTED
-        options.author = true
-        options.header = project.name
-        //options.overview = "${projectDir}/src/main/java/overview.html"
-    }
-
-    task sourcesJar(type: Jar, dependsOn:classes) {
-        classifier = 'sources'
-        from sourceSets.main.allJava.srcDirs
-        include '**/*.java', '**/*.aj'
-    }
-
-    task javadocJar(type: Jar) {
-        classifier = 'javadoc'
-        from javadoc
-    }
-
-    artifacts {
-        archives sourcesJar
-        archives javadocJar
-    }
-}
-
-
-project('spring-core') {
-    description = 'Spring Core'
-
-    // As of Spring 3.2 spring-core repackages both asm 4.0 and cglib 3.0 and inlines both
-    // into the spring-core jar. cglib 3.0 itself depends on asm 4.0, and is therefore
-    // further transformed by the JarJar task to depend on org.springframework.asm; this
-    // avoids including two different copies of asm unnecessarily. If however future cglib
-    // versions drift from the version of asm used by Spring internally, this duplication
-    // will become necessary.
-    def asmVersion = '4.0'
-    def cglibVersion = '3.0'
-
-    configurations {
-        jarjar
-        asm
-        cglib
-    }
-
-    task asmRepackJar(type: Jar) { repackJar ->
-        repackJar.baseName = "spring-asm-repack"
-        repackJar.version = asmVersion
-
-        doLast() {
-            project.ant {
-                taskdef name: "jarjar", classname: "com.tonicsystems.jarjar.JarJarTask",
-                    classpath: configurations.jarjar.asPath
-                jarjar(destfile: repackJar.archivePath) {
-                    configurations.asm.each { originalJar ->
-                        zipfileset(src: originalJar)
-                    }
-                    rule(pattern: 'org.objectweb.asm.**', result: 'org.springframework.asm.@1')
-                }
-            }
-        }
-    }
-
-    task cglibRepackJar(type: Jar) { repackJar ->
-        repackJar.baseName = "spring-cglib-repack"
-        repackJar.version = cglibVersion
-
-        doLast() {
-            project.ant {
-                taskdef name: "jarjar", classname: "com.tonicsystems.jarjar.JarJarTask",
-                    classpath: configurations.jarjar.asPath
-                jarjar(destfile: repackJar.archivePath) {
-                    configurations.cglib.each { originalJar ->
-                        zipfileset(src: originalJar)
-                    }
-                    // repackage net.sf.cglib => org.springframework.cglib
-                    rule(pattern: 'net.sf.cglib.**', result: 'org.springframework.cglib.@1')
-                    // as mentioned above, transform cglib's internal asm dependencies from
-                    // org.objectweb.asm => org.springframework.asm. Doing this counts on the
-                    // the fact that Spring and cglib depend on the same version of asm!
-                    rule(pattern: 'org.objectweb.asm.**', result: 'org.springframework.asm.@1')
-                }
-            }
-        }
-    }
-
-    dependencies {
-        asm "org.ow2.asm:asm:${asmVersion}@jar", "org.ow2.asm:asm-commons:${asmVersion}@jar"
-        cglib "cglib:cglib:${cglibVersion}@jar"
-        jarjar 'com.googlecode.jarjar:jarjar:1.3'
-
-        compile files(asmRepackJar)
-        compile "commons-logging:commons-logging:1.1.1"
-        compile("org.aspectj:aspectjweaver:${aspectjVersion}", optional)
-        compile("net.sf.jopt-simple:jopt-simple:3.0") { dep ->
-            optional dep
-            exclude group: 'org.apache.ant', module: 'ant'
-        }
-        compile("log4j:log4j:1.2.15") { dep ->
-            optional dep
-            exclude group: 'javax.mail', module: 'mail'
-            exclude group: 'javax.jms', module: 'jms'
-            exclude group: 'com.sun.jdmk', module: 'jmxtools'
-            exclude group: 'com.sun.jmx', module: 'jmxri'
-        }
-        testCompile "xmlunit:xmlunit:1.2"
-        testCompile "org.codehaus.woodstox:wstx-asl:3.2.7"
-    }
-
-    jar {
-        // inline all repackaged asm and cglib classes directly into the spring-core jar
-        dependsOn asmRepackJar
-        from(zipTree(asmRepackJar.archivePath)) {
-            include 'org/springframework/asm/**'
-        }
-        dependsOn cglibRepackJar
-        from(zipTree(cglibRepackJar.archivePath)) {
-            include 'org/springframework/cglib/**'
-        }
-    }
-}
-
-project('spring-beans') {
-    description = 'Spring Beans'
-    dependencies {
-        compile project(":spring-core")
-        compile files(project(":spring-core").cglibRepackJar)
-        compile("javax.el:el-api:1.0", provided)
-        compile("javax.inject:javax.inject:1", provided)
-    }
-}
-
-project('spring-aop') {
-    description = 'Spring AOP'
-    dependencies {
-        compile project(":spring-core")
-        compile files(project(":spring-core").cglibRepackJar)
-        compile project(":spring-beans")
-        compile("aopalliance:aopalliance:1.0")
-        compile("com.jamonapi:jamon:2.4", optional)
-        compile("commons-pool:commons-pool:1.5.3", optional)
-        compile("org.aspectj:aspectjweaver:${aspectjVersion}", optional)
-    }
-}
-
-project('spring-expression') {
-    description = 'Spring Expression Language (SpEL)'
-    dependencies {
-        compile project(":spring-core")
-    }
-}
-
-project('spring-instrument') {
-    description = 'Spring Instrument'
-    dependencies {
-        compile project(":spring-core")
-    }
-    jar {
-        manifest.attributes['Premain-Class'] =
-            'org.springframework.instrument.InstrumentationSavingAgent'
-    }
-}
-
-project('spring-instrument-tomcat') {
-    description = 'Spring Instrument Tomcat'
-    dependencies {
-        compile("org.apache.tomcat:catalina:6.0.16", provided)
-    }
-}
-
-project('spring-context') {
-    description = 'Spring Context'
-    dependencies {
-        compile(project(":spring-instrument"), optional)
-        compile project(":spring-aop")
-        compile project(":spring-beans")
-        compile project(":spring-expression")
-        compile project(":spring-core")
-        compile files(project(":spring-core").cglibRepackJar)
-        compile("backport-util-concurrent:backport-util-concurrent:3.0", optional)
-        compile("javax.annotation:jsr250-api:1.0", optional)
-        compile("javax.ejb:ejb-api:3.0", optional)
-        compile("javax.inject:javax.inject:1", optional)
-        compile("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1", optional)
-        compile("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1", optional)
-        compile("javax.persistence:persistence-api:1.0", optional)
-        compile("javax.validation:validation-api:1.0.0.GA", optional)
-        compile("javax.xml.ws:jaxws-api:2.1-1") { dep ->
-            optional dep
-            exclude group: 'javax.jws', module: 'jsr181'
-        }
-        compile("org.beanshell:bsh:2.0b4", optional)
-        compile("org.codehaus.groovy:groovy-all:1.6.3", optional)
-        compile("org.hibernate:hibernate-validator:4.2.0.Final") { dep ->
-            optional dep
-            exclude group: 'org.slf4j', module: 'slf4j-api'
-        }
-        compile("joda-time:joda-time:1.6", optional)
-        compile("org.jruby:jruby:1.4.0", optional)
-        compile("org.slf4j:slf4j-api:1.6.1", optional)
-        compile("org.codehaus.jsr166-mirror:jsr166:1.7.0", provided)
-        compile("org.aspectj:aspectjweaver:${aspectjVersion}", optional)
-        testCompile "commons-dbcp:commons-dbcp:1.2.2"
-        testCompile("javax.xml:jaxrpc-api:1.1")
-        testCompile("javax.inject:com.springsource.org.atinject.tck:1.0.0")
-    }
-
-    test {
-        jvmArgs = ['-disableassertions:org.aspectj.weaver.UnresolvedType'] // SPR-7989
-    }
-}
-
-project('spring-tx') {
-    description = 'Spring Transaction'
-    dependencies {
-        compile(project(":spring-context"), optional) // for JCA, @EnableTransactionManagement
-        compile(project(":spring-aop"), optional)
-        compile project(":spring-beans")
-        compile project(":spring-core")
-        compile("aopalliance:aopalliance:1.0")
-        compile("com.ibm.websphere:uow:6.0.2.17", provided)
-        compile("javax.resource:connector-api:1.5", optional)
-        compile("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1", optional)
-        testCompile "org.easymock:easymockclassextension:2.3"
-    }
-}
-
-project('spring-oxm') {
-    description = 'Spring Object/XML Marshalling'
-    apply from: 'oxm.gradle'
-    dependencies {
-        compile project(":spring-beans")
-        compile project(":spring-core")
-        compile(project(":spring-context"), optional) // for Jaxb2Marshaller
-        compile "commons-lang:commons-lang:2.5"
-        compile("com.thoughtworks.xstream:xstream:1.3.1", optional)
-        compile("com.sun.xml.bind:jaxb-impl:2.1.7", optional)
-        compile("org.jibx:jibx-run:1.2.3", optional)
-        compile("org.apache.xmlbeans:xmlbeans:2.4.0", optional)
-        compile("org.codehaus.castor:castor-xml:1.3.2", optional)
-        testCompile "org.codehaus.jettison:jettison:1.0.1"
-        testCompile "xmlunit:xmlunit:1.2"
-        testCompile "xmlpull:xmlpull:1.1.3.4a"
-        testCompile(files(genCastor.classesDir).builtBy(genCastor))
-        testCompile(files(genJaxb.classesDir).builtBy(genJaxb))
-        testCompile(files(genXmlbeans.classesDir).builtBy(genXmlbeans))
-    }
-}
-
-project('spring-jms') {
-    description = 'Spring JMS'
-    dependencies {
-        compile project(":spring-core")
-        compile project(":spring-beans")
-        compile project(":spring-aop")
-        compile project(":spring-context")
-        compile project(":spring-tx")
-        compile(project(":spring-oxm"), optional)
-        compile("aopalliance:aopalliance:1.0")
-        compile("org.codehaus.jackson:jackson-mapper-asl:1.4.2", optional)
-    }
-}
-
-project('spring-jdbc') {
-    description = 'Spring JDBC'
-    dependencies {
-        compile project(":spring-core")
-        compile project(":spring-beans")
-        compile(project(":spring-context"), optional) // for JndiDataSourceLookup
-        compile project(":spring-tx")
-        compile("c3p0:c3p0:0.9.1.2", optional)
-        compile("hsqldb:hsqldb:${hsqldbVersion}", optional)
-        compile("com.h2database:h2:1.0.71", optional)
-        compile("org.apache.derby:derby:10.5.3.0_1", optional)
-        compile("org.apache.derby:derbyclient:10.5.3.0_1", optional)
-        compile("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1", optional)
-        testCompile "org.easymock:easymock:2.5.1"
-    }
-}
-
-project('spring-context-support') {
-    description = 'Spring Context Support'
-    dependencies {
-        compile project(":spring-core")
-        compile project(":spring-beans")
-        compile project(":spring-context")
-        compile(project(":spring-jdbc"), optional) // for Quartz support
-        compile(project(":spring-tx"), optional) // for Quartz support
-        compile("org.codehaus.fabric3.api:commonj:1.1.0", optional)
-        compile("javax.cache:cache-api:0.5", optional)
-        compile("net.sf.ehcache:ehcache-core:2.0.0", optional)
-        compile("opensymphony:quartz:1.6.2", optional)
-        compile("javax.mail:mail:1.4", optional)
-        compile("velocity:velocity:1.5", optional)
-        compile("commons-collections:commons-collections:3.2", optional)
-        compile("org.freemarker:freemarker:2.3.15", optional)
-        compile("jasperreports:jasperreports:2.0.5") { dep ->
-            optional dep
-            transitive = false
-        }
-        compile("commons-digester:commons-digester:1.8.1", optional)
-        compile("commons-beanutils:commons-beanutils:1.8.0", optional)
-        compile("com.lowagie:itext:2.0.8", optional)
-        testCompile "hsqldb:hsqldb:${hsqldbVersion}"
-        testCompile("org.apache.poi:poi:3.0.2-FINAL") {
-            exclude group: 'log4j', module: 'log4j'
-        }
-    }
-
-    // pick up **/*.types files in src/main
-    sourceSets.main.resources.srcDirs += 'src/main/java'
-}
-
-project('spring-web') {
-    description = 'Spring Web'
-    dependencies {
-        compile project(":spring-core")
-        compile project(":spring-beans") // for MultiPartFilter
-        compile project(":spring-aop") // for JaxWsPortProxyFactoryBean
-        compile project(":spring-context")
-        compile(project(":spring-oxm"), optional) // for MarshallingHttpMessageConverter
-        compile("aopalliance:aopalliance:1.0")
-        compile("com.caucho:hessian:3.2.1", optional)
-        compile("rome:rome:1.0", optional)
-        compile("javax.el:el-api:1.0", optional)
-        compile("javax.faces:jsf-api:1.2_08", optional)
-        compile("javax.portlet:portlet-api:2.0", provided)
-        compile("org.apache.tomcat:tomcat-servlet-api:7.0.32", provided) // servlet-api 3.0
-        compile("javax.servlet.jsp:jsp-api:2.1", provided)
-        compile("javax.xml.soap:saaj-api:1.3", provided)
-        compile("axis:axis:1.4", optional)
-        compile("commons-fileupload:commons-fileupload:1.2", optional)
-        runtime("commons-io:commons-io:1.3", optional)
-        compile("commons-httpclient:commons-httpclient:3.1", optional)
-        compile("org.apache.httpcomponents:httpclient:4.2", optional)
-        compile("org.codehaus.jackson:jackson-mapper-asl:1.4.2", optional)
-        compile("com.fasterxml.jackson.core:jackson-databind:2.0.1", optional)
-        compile("taglibs:standard:1.1.2", optional)
-        compile("org.eclipse.jetty:jetty-servlet:8.1.5.v20120716") { dep ->
-            optional dep
-            exclude group: 'org.eclipse.jetty.orbit', module: 'javax.servlet'
-        }
-        compile("org.eclipse.jetty:jetty-server:8.1.5.v20120716") { dep ->
-            optional dep
-            exclude group: 'org.eclipse.jetty.orbit', module: 'javax.servlet'
-        }
-        testCompile project(":spring-context-support")  // for JafMediaTypeFactory
-        testCompile "xmlunit:xmlunit:1.2"
-    }
-
-    // pick up ContextLoader.properties in src/main
-    sourceSets.main.resources.srcDirs += 'src/main/java'
-}
-
-project('spring-orm') {
-    description = 'Spring Object/Relational Mapping'
-    dependencies {
-        // compiling against both hibernate 3 and 4 here in order to support
-        // our respective orm.hibernate3 and orm.hibernate4 packages
-        compile("aopalliance:aopalliance:1.0")
-        compile("org.hibernate:com.springsource.org.hibernate:3.3.1.GA", optional)
-        compile("org.hibernate:hibernate-cglib-repack:2.1_3", optional)
-        compile("org.hibernate:hibernate-annotations:3.4.0.GA", optional)
-        compile("org.hibernate:hibernate-entitymanager:3.4.0.GA", optional)
-        compile("org.apache.openjpa:openjpa:1.1.0", optional)
-        compile("org.eclipse.persistence:org.eclipse.persistence.core:1.0.1", optional)
-        compile("org.eclipse.persistence:org.eclipse.persistence.jpa:1.0.1", optional)
-        compile("toplink.essentials:toplink-essentials:2.0-41b", optional)
-        compile("javax.jdo:jdo-api:3.0", optional)
-        compile("org.apache.ibatis:ibatis-sqlmap:2.3.4.726", optional)
-        testCompile "javax.servlet:servlet-api:2.5"
-        testCompile "org.slf4j:slf4j-jcl:1.5.3"
-        testCompile "commons-dbcp:commons-dbcp:1.2.2"
-        testCompile "org.eclipse.persistence:org.eclipse.persistence.asm:1.0.1"
-        testCompile "org.eclipse.persistence:org.eclipse.persistence.antlr:1.0.1"
-        compile project(":spring-core")
-        compile project(":spring-beans")
-        compile(project(":spring-aop"), optional)
-        compile(project(":spring-context"), optional)
-        compile project(":spring-tx")
-        compile project(":spring-jdbc")
-        compile(project(":spring-web")) { dep ->
-            optional dep
-            exclude group: 'javax.persistence', module: 'persistence-api'
-        }
-    }
-}
-
-project('spring-orm-hibernate4') {
-    description = 'Spring Object/Relational Mapping - Hibernate 4 support'
-    ext.mergeIntoProject = project(':spring-orm')
-    apply from: "${gradleScriptDir}/merge-artifacts.gradle"
-    dependencies {
-        compile project(":spring-orm").sourceSets.main.output
-        compile project(":spring-tx")
-        compile project(":spring-jdbc")
-        compile("org.hibernate:hibernate-core:4.1.0.Final", optional)
-        compile("org.hibernate:hibernate-entitymanager:4.1.0.Final", optional)
-        compile(project(":spring-web")) { dep ->
-            optional dep
-            exclude group: 'javax.persistence', module: 'persistence-api'
-        }
-        compile("javax.servlet:servlet-api:2.5", optional)
-    }
-}
-
-project('spring-webmvc') {
-    description = 'Spring Web MVC'
-    dependencies {
-        compile project(":spring-core")
-        compile project(":spring-expression")
-        compile project(":spring-beans")
-        compile project(":spring-web")
-        compile project(":spring-context")
-        compile(project(":spring-context-support"), optional) // for Velocity support
-        compile(project(":spring-oxm"), optional) // for MarshallingView
-        compile("org.apache.tiles:tiles-api:2.1.2", optional)
-        compile("org.apache.tiles:tiles-core:2.1.2", optional)
-        compile("org.apache.tiles:tiles-jsp:2.1.2", optional)
-        compile("org.apache.tiles:tiles-servlet:2.1.2", optional)
-        compile("velocity-tools:velocity-tools-view:1.4", optional)
-        compile("net.sourceforge.jexcelapi:jxl:2.6.3") { dep ->
-            optional dep
-            exclude group: 'log4j', module: 'log4j'
-        }
-        compile("org.apache.poi:poi:3.0.2-FINAL") { dep ->
-            optional dep
-            exclude group: 'log4j', module: 'log4j'
-        }
-        compile("javax.servlet:jstl:1.1.2", provided)
-        compile("org.apache.tomcat:tomcat-servlet-api:7.0.32", provided) // servlet-api 3.0
-        testCompile project(":spring-aop")
-        testCompile("org.slf4j:slf4j-log4j12:1.6.1") {
-            exclude group: 'log4j', module: 'log4j'
-        }
-        testCompile "rhino:js:1.7R1"
-        testCompile "xmlunit:xmlunit:1.2"
-        testCompile("dom4j:dom4j:1.6.1") {
-            exclude group: 'xml-apis', module: 'xml-apis'
-        }
-        testCompile("jaxen:jaxen:1.1.1") {
-            exclude group: 'xml-apis', module: 'xml-apis'
-            exclude group: 'xom', module: 'xom'
-            exclude group: 'xerces', module: 'xercesImpl'
-        }
-    }
-
-    // pick up DispatcherServlet.properties in src/main
-    sourceSets.main.resources.srcDirs += 'src/main/java'
-}
-
-project('spring-webmvc-tiles3') {
-    description = 'Spring Framework Tiles3 Integration'
-    ext.mergeIntoProject = project(':spring-webmvc')
-    apply from: "${gradleScriptDir}/merge-artifacts.gradle"
-    dependencies {
-        compile project(":spring-context")
-        compile project(":spring-webmvc").sourceSets.main.output
-        compile("javax.el:el-api:1.0", provided)
-        compile("javax.servlet:jstl:1.1.2", provided)
-        compile("javax.servlet.jsp:jsp-api:2.1", provided)
-        compile("org.apache.tiles:tiles-request-api:1.0.1", optional)
-        compile("org.apache.tiles:tiles-request-servlet-wildcard:1.0.1") { dep->
-            optional dep
-            exclude group: 'org.springframework', module: 'spring-web'
-        }
-        compile("org.apache.tiles:tiles-api:3.0.1", optional)
-        compile("org.apache.tiles:tiles-core:3.0.1", optional)
-        compile("org.apache.tiles:tiles-servlet:3.0.1", optional)
-        compile("org.apache.tiles:tiles-jsp:3.0.1", optional)
-        compile("org.apache.tiles:tiles-el:3.0.1", optional)
-        compile("org.apache.tomcat:tomcat-servlet-api:7.0.32", provided) // servlet-api 3.0
-        compile project(":spring-web").sourceSets*.output // mock request & response
-    }
-}
-
-project('spring-webmvc-portlet') {
-    description = 'Spring Web Portlet'
-    dependencies {
-        compile("javax.servlet:servlet-api:2.5", provided)
-        compile project(":spring-core")
-        compile project(":spring-beans")
-        compile project(":spring-context")
-        compile project(":spring-web")
-        compile project(":spring-webmvc")
-    }
-
-    // pick up DispatcherPortlet.properties in src/main
-    sourceSets.main.resources.srcDirs += 'src/main/java'
-}
-
-project('spring-test') {
-    description = 'Spring TestContext Framework'
-    dependencies {
-        compile project(":spring-core")
-        compile(project(":spring-beans"), optional)
-        compile(project(":spring-context"), optional)
-        compile(project(":spring-jdbc"), optional)
-        compile(project(":spring-tx"), optional)
-        compile(project(":spring-orm"), optional)
-        compile(project(":spring-web"), optional)
-        compile(project(":spring-webmvc"), optional)
-        compile(project(":spring-webmvc-portlet"), optional)
-        compile("junit:junit-dep:4.10") { dep ->
-            optional dep
-            // We already have hamcrest-all as a global testCompile dependency.
-            exclude group: 'org.hamcrest', module: 'hamcrest-core'
-        }
-        compile("org.testng:testng:6.5.2") { dep ->
-            optional dep
-            exclude group: 'junit', module: 'junit'
-            // We already have hamcrest-all as a global testCompile dependency.
-            exclude group: 'org.hamcrest', module: 'hamcrest-core'
-        }
-        compile("javax.servlet:servlet-api:2.5", optional)
-        compile("javax.servlet.jsp:jsp-api:2.1", optional)
-        compile("javax.portlet:portlet-api:2.0", optional)
-        compile("javax.activation:activation:1.0", provided)
-        testCompile "org.slf4j:slf4j-jcl:1.5.3"
-    }
-}
-
-project('spring-test-mvc') {
-    description = 'Spring Test MVC Framework'
-    ext.mergeIntoProject = project(':spring-test')
-    apply from: "${gradleScriptDir}/merge-artifacts.gradle"
-    apply from: "ide.gradle"
-    dependencies {
-        compile project(":spring-context")
-        compile project(":spring-webmvc")
-        compile project(":spring-test").sourceSets.main.output
-        compile("org.apache.tomcat:tomcat-servlet-api:7.0.32", provided)
-        compile("org.hamcrest:hamcrest-core:1.3", optional)
-        compile("com.jayway.jsonpath:json-path:0.8.1", optional)
-        compile("xmlunit:xmlunit:1.2", optional)
-        testCompile("org.slf4j:jcl-over-slf4j:1.6.1")
-        testCompile("org.slf4j:slf4j-log4j12:1.6.1") {
-            exclude group: 'log4j', module: 'log4j'
-        }
-        testCompile("log4j:log4j:1.2.15") {
-            exclude group: 'javax.mail', module: 'mail'
-            exclude group: 'javax.jms', module: 'jms'
-            exclude group: 'com.sun.jdmk', module: 'jmxtools'
-            exclude group: 'com.sun.jmx', module: 'jmxri'
-        }
-        testCompile "javax.servlet:jstl:1.2"
-        testCompile "org.hibernate:hibernate-validator:4.2.0.Final"
-        testCompile "org.codehaus.jackson:jackson-mapper-asl:1.4.2"
-        testCompile project(":spring-oxm")
-        testCompile "com.thoughtworks.xstream:xstream:1.3.1"
-        testCompile "cglib:cglib-nodep:2.2"
-        testCompile "rome:rome:1.0"
-        testCompile "javax.xml.bind:jaxb-api:2.2.6"
-        testCompile "org.easymock:easymockclassextension:2.3"
-        testCompile("org.springframework.security:spring-security-core:3.1.2.RELEASE") {
-            exclude group: 'org.springframework'
-        }
-        testCompile("org.springframework.security:spring-security-web:3.1.2.RELEASE") {
-            exclude group: 'org.springframework'
-        }
-        testCompile("org.springframework.security:spring-security-config:3.1.2.RELEASE") {
-            exclude group: 'org.springframework'
-        }
-        testCompile("org.springframework.hateoas:spring-hateoas:0.3.0.RELEASE")
-    }
-}
-
-project('spring-struts') {
-    description = 'Spring Struts'
-    dependencies {
-        compile project(":spring-core")
-        compile project(":spring-beans")
-        compile project(":spring-context")
-        compile project(":spring-web")
-        compile project(":spring-webmvc")
-        compile "struts:struts:1.2.9"
-        compile "commons-beanutils:commons-beanutils:1.7.0"
-        compile("javax.servlet:servlet-api:2.5", provided)
-        testCompile project(":spring-test")
-    }
-}
-
-project('spring-aspects') {
-    description = 'Spring Aspects'
-    apply from: 'aspects.gradle'
-    dependencies {
-        compile(project(":spring-beans"), optional) // for @Configurable support
-        compile(project(":spring-aop"), optional) // for @Async support
-        compile(project(":spring-context"), optional) // for @Enable* support
-        compile(project(":spring-context-support"), optional) // for JavaMail support
-        compile(project(":spring-tx"), optional) // for JPA, @Transactional support
-        compile(project(":spring-orm"), optional) // for JPA exception translation support
-        aspects project(":spring-orm")
-        ajc "org.aspectj:aspectjtools:${aspectjVersion}"
-        compile "org.aspectj:aspectjrt:${aspectjVersion}"
-        testCompile project(":spring-core") // for CodeStyleAspect
-        compile project(":spring-beans") // for 'p' namespace visibility
-        testCompile project(":spring-test")
-    }
-    eclipse.project {
-        natures += 'org.eclipse.ajdt.ui.ajnature'
-        buildCommands = [new org.gradle.plugins.ide.eclipse.model.
-                BuildCommand('org.eclipse.ajdt.core.ajbuilder')]
-    }
-}
-
-configure(rootProject) {
-    description = 'Spring Framework'
-
-    apply plugin: 'docbook-reference'
-    apply from: "${gradleScriptDir}/jdiff.gradle"
-
-    reference {
-        sourceDir = file('src/reference/docbook')
-        pdfFilename = 'spring-framework-reference.pdf'
-    }
-
-    // don't publish the default jar for the root project
-    configurations.archives.artifacts.clear()
-
-    dependencies { // for integration tests
-        testCompile project(":spring-core")
-        testCompile project(":spring-beans")
-        testCompile project(":spring-aop")
-        testCompile project(":spring-expression")
-        testCompile project(":spring-context")
-        testCompile project(":spring-tx")
-        testCompile project(":spring-jdbc")
-        testCompile project(":spring-test")
-        testCompile project(":spring-web")
-        testCompile project(":spring-webmvc-portlet")
-        testCompile "org.hibernate:hibernate-core:4.1.0.Final"
-        testCompile "javax.servlet:servlet-api:2.5"
-    }
-
-    task api(type: Javadoc) {
-        group = 'Documentation'
-        description = 'Generates aggregated Javadoc API documentation.'
-        title = "${rootProject.description} ${version} API"
-        options.memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PROTECTED
-        options.author = true
-        options.header = rootProject.description
-        options.overview = 'src/api/overview.html'
-        options.splitIndex = true
-        options.links(
-            'http://docs.jboss.org/jbossas/javadoc/4.0.5/connector'
-        )
-        source subprojects.collect { project ->
-            project.sourceSets.main.allJava
-        }
-        destinationDir = new File(buildDir, "api")
-        classpath = files(subprojects.collect { project ->
-            project.sourceSets.main.compileClasspath
-        })
-        maxMemory = '1024m'
-    }
-
-    task docsZip(type: Zip) {
-        group = 'Distribution'
-        baseName = 'spring-framework'
-        classifier = 'docs'
-        description = "Builds -${classifier} archive containing api and reference " +
-            "for deployment at http://static.springframework.org/spring-framework/docs."
-
-        from('src/dist') {
-            include 'changelog.txt'
-        }
-
-        from (api) {
-            into 'api'
-        }
-
-        from (reference) {
-            into 'reference'
-        }
-    }
-
-    task schemaZip(type: Zip) {
-        group = 'Distribution'
-        baseName = 'spring-framework'
-        classifier = 'schema'
-        description = "Builds -${classifier} archive containing all " +
-            "XSDs for deployment at http://springframework.org/schema."
-
-        subprojects.each { subproject ->
-            def Properties schemas = new Properties();
-
-            subproject.sourceSets.main.resources.find {
-                it.path.endsWith('META-INF/spring.schemas')
-            }?.withInputStream { schemas.load(it) }
-
-            for (def key : schemas.keySet()) {
-                def shortName = key.replaceAll(/http.*schema.(.*).spring-.*/, '$1')
-                assert shortName != key
-                File xsdFile = subproject.sourceSets.main.resources.find {
-                    it.path.endsWith(schemas.get(key))
-                }
-                assert xsdFile != null
-                into (shortName) {
-                    from xsdFile.path
-                }
-            }
-        }
-    }
-
-    task distZip(type: Zip, dependsOn: [docsZip, schemaZip]) {
-        group = 'Distribution'
-        baseName = 'spring-framework'
-        classifier = 'dist'
-        description = "Builds -${classifier} archive, containing all jars and docs, " +
-                      "suitable for community download page."
-
-        ext.baseDir = "${baseName}-${project.version}";
-
-        from('src/dist') {
-            include 'readme.txt'
-            include 'license.txt'
-            include 'notice.txt'
-            into "${baseDir}"
-            expand(copyright: new Date().format('yyyy'), version: project.version)
-        }
-
-        from(zipTree(docsZip.archivePath)) {
-            into "${baseDir}/docs"
-        }
-
-        from(zipTree(schemaZip.archivePath)) {
-            into "${baseDir}/schema"
-        }
-
-        subprojects.each { subproject ->
-            into ("${baseDir}/libs") {
-                from subproject.jar
-                if (subproject.tasks.findByPath('sourcesJar')) {
-                    from subproject.sourcesJar
-                }
-                if (subproject.tasks.findByPath('javadocJar')) {
-                    from subproject.javadocJar
-                }
-            }
-        }
-    }
-
-    // Create an distribution that contains all dependencies (required and optional).
-    // Not published by default; only for use when building from source.
-    task depsZip(type: Zip, dependsOn: distZip) { zipTask ->
-        group = 'Distribution'
-        baseName = 'spring-framework'
-        classifier = 'dist-with-deps'
-        description = "Builds -${classifier} archive, containing everything " +
-            "in the -${distZip.classifier} archive plus all runtime dependencies."
-
-        from zipTree(distZip.archivePath)
-
-        gradle.taskGraph.whenReady { taskGraph ->
-            if (taskGraph.hasTask(":${zipTask.name}")) {
-                def projectNames = rootProject.subprojects*.name
-                def artifacts = new HashSet()
-                subprojects.each { subproject ->
-                    subproject.configurations.runtime.resolvedConfiguration.resolvedArtifacts.each { artifact ->
-                        def dependency = artifact.moduleVersion.id
-                        if (!projectNames.contains(dependency.name)) {
-                            artifacts << artifact.file
-                        }
-                    }
-                }
-
-                zipTask.from(artifacts) {
-                    into "${distZip.baseDir}/deps"
-                }
-            }
-        }
-    }
-
-    artifacts {
-        archives docsZip
-        archives schemaZip
-        archives distZip
-    }
-
-    task wrapper(type: Wrapper) {
-        description = 'Generates gradlew[.bat] scripts'
-        gradleVersion = '1.2'
-
-        doLast() {
-            def gradleOpts = "-XX:MaxPermSize=1024m -Xmx1024m"
-            def gradleBatOpts = "$gradleOpts -XX:MaxHeapSize=256"
-            File wrapperFile = file('gradlew')
-            wrapperFile.text = wrapperFile.text.replace("DEFAULT_JVM_OPTS=",
-                "GRADLE_OPTS=\"$gradleOpts \$GRADLE_OPTS\"\nDEFAULT_JVM_OPTS=")
-            File wrapperBatFile = file('gradlew.bat')
-            wrapperBatFile.text = wrapperBatFile.text.replace("set DEFAULT_JVM_OPTS=",
-                "set GRADLE_OPTS=$gradleBatOpts %GRADLE_OPTS%\nset DEFAULT_JVM_OPTS=")
-        }
-    }
-}
@@ -0,0 +1,32 @@
+version=3.1.5
+
+natural.name=spring-framework
+project.name=Spring Framework
+project.key=SPR
+ivy.cache.dir=${basedir}/../ivy-cache
+integration.repo.dir=${basedir}/../integration-repo
+license.dir=${basedir}/../build-spring-framework/resources
+javadoc.exclude.package.names=org/springframework/samples/**
+javadoc.max.memory=1024M
+test.vm.args=-Xmx1024M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError
+compiler.args=-enableJavadoc -warn:none
+
+## common osgi ranges used in template.mf files
+spring.osgi.range.nq=${version:[=.=.=, =.=.+1)}
+spring.osgi.range="${spring.osgi.range.nq}"
+aj.osgi.range="[1.6.8, 2.0.0)"
+
+## For GA releases
+#release.type=release
+#build.stamp=RELEASE
+
+## For milestone releases
+#release.type=milestone
+#build.stamp=M1
+
+## For trunk development / ci builds
+release.type=integration
+build.stamp=BUILD-SNAPSHOT
+
+#bundlor
+fail.on.warnings=false
@@ -0,0 +1,4 @@
+# common dependency versions
+aspectj.version=1.6.8.RELEASE
+junit.version=4.9.0
+testng.version=5.12.1
@@ -0,0 +1,6 @@
+# properties used by Bamboo build plan at http://build.springframework.org/build/admin/buildConfiguration.action?buildKey=SPR-TRUNKQUICK
+# run in conjunction with ANT_OPTS='-XX:MaxPermSize=512m -Xmx1024m'
+compiler.args=-enableJavadoc -warn:none
+java.awt.headless=true
+ci.build=true
+test.vm.args=-XX:MaxPermSize=512m -Xmx1024m
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<profiles version="11">
+<profile kind="CodeFormatterProfile" name="Spring" version="11">
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.compiler.source" value="1.5"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+</profile>
+</profiles>
@@ -1,2 +0,0 @@
-previousVersion=3.2.0.RC1
-version=3.2.0.RC2
@@ -1,26 +0,0 @@
-import org.gradle.plugins.ide.eclipse.model.ProjectDependency
-
-eclipse.classpath.file.whenMerged { classpath ->
-    // servlet-api (2.5) and tomcat-servlet-api (3.0) classpath entries should not be
-    // exported to dependent projects in Eclipse to avoid false compilation errors due
-    // to changing APIs across these versions
-    classpath.entries.findAll { entry -> entry.path.contains('servlet-api') }*.exported = false
-
-    // GRADLE-1116
-    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) {
-            def projectName = matcher[0][1]
-            def path = "/${projectName}"
-            if(!classpath.entries.find { e -> e instanceof ProjectDependency && e.path == path }) {
-                def dependency = new ProjectDependency(path, project(":${projectName}").path)
-                dependency.exported = true
-                classpath.entries.add(dependency)
-            }
-            classpath.entries.remove(entry)
-        }
-    }
-    classpath.entries.removeAll { entry -> (entry.path =~ /(?!.*?repack.*\.jar).*?\/([^\/]+)\/build\/libs\/[^\/]+\.jar/) }
-}
@@ -1,74 +0,0 @@
-/**
- * Generate a JDiff report between the current version and an older version.
- *
- * Usage:
- *  gradle jdiff [-D OLD_VERSION=3.1.3.RELEASE] -D OLD_VERSION_ROOT=/path/to/3.1.3.RELEASE
- *
- * View generated report at:
- *  build/reports/jdiff/changes.html
- *
- * @param OLD_VERSION optional, defaulting to value of `previousVersion` in gradle.properties
- * @param OLD_VERSION_ROOT required, typically pointing to a separate git clone dir
- */
-task jdiff {
-    description = 'Generates a JDiff report'
-    group = 'Documentation'
-
-    def jdiffHome = "${rootProject.rootDir}/gradle/jdiff"
-
-    ant.taskdef(
-            name: 'jdiff',
-            classname: 'jdiff.JDiffAntTask',
-            classpath: "${jdiffHome}/antjdiff.jar")
-
-    def previousVersion = rootProject.previousVersion
-
-    def currentVersion = rootProject.version
-    def currentVersionRoot = rootProject.rootDir
-
-    def oldVersion = System.getProperty("OLD_VERSION") ?: previousVersion
-    def oldVersionRoot = System.getProperty("OLD_VERSION_ROOT")
-
-    def outputDir = "${rootProject.buildDir}/reports/jdiff/${oldVersion}_to_${currentVersion}"
-
-    doLast {
-        if (oldVersionRoot == null)
-            throw new IllegalArgumentException(
-                "Set OLD_VERSION_ROOT property to indicate the root directory for ${oldVersion}")
-
-        oldVersionRoot = new File(oldVersionRoot)
-
-        ant.property(name: 'JDIFF_HOME', value: jdiffHome)
-        ant.mkdir(dir: outputDir)
-        ant.jdiff(
-                destdir: outputDir,
-                verbose: 'off',
-                stats: 'on',
-                docchanges: 'on') {
-            old(name: "Spring Framework ${oldVersion}") {
-                oldVersionRoot.eachDirMatch( {
-                        def candidate = new File(it)
-                        candidate.name.matches("org.springframework.*") ||
-                        candidate.name.matches("spring-.*") }) { match ->
-                    match.eachDirRecurse { subdir ->
-                        if (subdir.path ==~ '.*/src/main/java$') {
-                            dirset(dir: subdir.path, includes: 'org/**')
-                        }
-                    }
-                }
-            }
-            'new'(name: "Spring Framework ${currentVersion}") {
-                currentVersionRoot.eachDirMatch( {
-                        def candidate = new File(it)
-                        candidate.name.matches("org.springframework.*") ||
-                        candidate.name.matches("spring-.*") }) { match ->
-                    match.eachDirRecurse { subdir ->
-                        if (subdir.path ==~ '.*/src/main/java$') {
-                            dirset(dir: subdir.path, includes: 'org/**')
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
@@ -1,506 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
-
-
@@ -1,9 +0,0 @@
-/** 
- * This class is used only as a "null" argument for Javadoc when comparing
- * two API files. Javadoc has to have a package, .java or .class file as an 
- * argument, even though JDiff doesn't use it.
- */
-public class Null {
-    public Null() {
-    }
-}
@@ -1,6 +0,0 @@
-This distribution of JDiff 1.1.1 is included in the Spring Framework build
-because JDiff has a hard requirement on a JDIFF_HOME directory containing
-jdiff.jar and xerces.jar as well as other presentation resources.
-
-The actual generation of JDiff reports is driven by the `jdiff` task declared
-in build.gradle in the project root.
@@ -1,59 +0,0 @@
-
-                           JDiff Doclet
-                           ------------
-
-                           Matthew Doar
-                          mdoar@pobox.com
-
-
-The JDiff doclet is used to generate a report describing the
-difference between two public Java APIs. 
-
-The file jdiff.html contains the reference page for JDiff.  The latest
-version of JDiff can be downloaded at:
-http://sourceforge.net/projects/javadiff
-
-To use the Ant task on your own project, see example.xml. More examples
-of using JDiff to compare the public APIs of J2SE1.3 and J2SE1.4 can
-be seen at http://www.jdiff.org
-
-For an example with the source distribution, run "ant" and
-look at the HTML output in ./build/reports/example/changes.html 
-The page at ./build/reports/example/changes/com.acme.sp.SPImpl.html
-shows what a typical page of changes looks like. 
-
-System Requirements
-------------------
-
-JDiff has been tested with all releases of Java since J2SE1.2 but
-releases of JDiff after 1.10.0 focus on JDK1.5.
-
-License
-------
-
-JDiff is licensed under the Lesser GNU General Public License (LGPL).
-See the file LICENSE.txt.
-
-Acknowledgements
----------------
-
-JDiff uses Stuart D. Gathman's Java translation of Gene Myers' O(ND) 
-difference algorithm.
-
-JDiff uses Xerces 1.4.2 from http://www.apache.org.
-
-JDiff also includes a script to use the classdoc application from
-http://classdoc.sourceforge.net or http://www.jensgulden.de, by Jens
-Gulden, (mail@jensgulden.de), to call a doclet such as jdiff on a .jar
-file rather than on source.
-
-Many thanks to the reviewers at Sun and Vitria who gave feedback on early
-versions of JDiff output, and also to the distillers of Laphroaig, and to
-Arturo Fuente for his consistently fine cigars which helped inspire
-much of this work.
-
-
-Footnote:
-
-If you are looking for a generalized diff tool for XML, try diffmk from
-http://wwws.sun.com/software/xml/developers/diffmk/
@@ -1,64 +0,0 @@
-/**
- * Will merge the artifacts of the current project into mergeIntoProject. For example, to
- * bundle spring-test-mvc in spring-test's jars. This script will perform the following
- * steps:
- *
- * - Ensure that jar tasks of the project being merged from will execute the tasks of the
- *   project being merged into
- *
- * - Add the project being merged into to the classpath of the project being merged from
- *
- * - Update the pom.xml of the project being merged into to contain the entries from the
- *   project being merged from
- *
- * Example Usage:
- *
- *   ext.mergeIntoProject = project(':spring-test')
- *   apply from: "${rootProject.projectDir}/gradle/merge-artifacts.gradle"
- */
-
-def mergeFromProject = project
-
-// invoking a task on mergeFromProject will invoke the task with the same name on mergeIntoProject
-def taskNamesToMerge = ['sourcesJar','jar','javadocJar','javadoc','install','artifactoryPublish']
-taskNamesToMerge.each { taskName ->
-    def taskToRemove = mergeFromProject.tasks.findByPath(taskName)
-    if(taskToRemove) {
-        taskToRemove.enabled = false
-        taskToRemove.dependsOn mergeIntoProject."$taskName"
-    }
-}
-
-// update mergeIntoProject artifacts to contain the mergeFromProject artifact contents
-mergeIntoProject."sourcesJar" {
-    from mergeFromProject.sourcesJar.source
-}
-mergeIntoProject."jar" {
-    from mergeFromProject.jar.source
-}
-mergeIntoProject."javadoc" {
-    source += mergeFromProject.javadoc.source
-    classpath += mergeFromProject.javadoc.classpath
-}
-
-// Update mergeIntoProject to contain additional configurations that contains all the dependencies from mergeFromProject
-// so that Maven pom generation works
-gradle.taskGraph.whenReady {
-    mergeFromProject.configurations.archives.artifacts.clear()
-
-    mergeFromProject.configurations.each { config->
-        def mapping = mergeFromProject.conf2ScopeMappings.getMapping([config])
-        if(mapping.scope) {
-            def newConfigName = mergeFromProject.name + "-"+ config.name
-            mergeIntoProject.configurations.add(newConfigName)
-            config.dependencies.each { dependency ->
-                mergeIntoProject.dependencies.add(newConfigName, dependency)
-            }
-            configure(mergeIntoProject.install.repositories.mavenInstaller.pom.scopeMappings) {
-                addMapping(mapping.priority + 100, mergeIntoProject.configurations."$newConfigName", mapping.scope)
-            }
-            mergeIntoProject.optionalDeps += mergeFromProject.optionalDeps
-            mergeIntoProject.providedDeps += mergeFromProject.providedDeps
-        }
-    }
-}
@@ -1,60 +0,0 @@
-apply plugin: 'maven'
-
-ext.optionalDeps = []
-ext.providedDeps = []
-
-ext.optional = { optionalDeps << it }
-ext.provided = { providedDeps << it }
-
-install {
-    repositories.mavenInstaller {
-        customizePom(pom, project)
-    }
-}
-
-def customizePom(pom, gradleProject) {
-    pom.whenConfigured { generatedPom ->
-        // respect 'optional' and 'provided' dependencies
-        gradleProject.optionalDeps.each { dep ->
-            generatedPom.dependencies.findAll { it.artifactId == dep.name }*.optional = true
-        }
-        gradleProject.providedDeps.each { dep ->
-            generatedPom.dependencies.findAll { it.artifactId == dep.name }*.scope = 'provided'
-        }
-
-        // eliminate test-scoped dependencies (no need in maven central poms)
-        generatedPom.dependencies.removeAll { dep ->
-            dep.scope == 'test'
-        }
-
-        // add all items necessary for maven central publication
-        generatedPom.project {
-            name = gradleProject.description
-            description = gradleProject.description
-            url = 'https://github.com/SpringSource/spring-framework'
-            organization {
-                name = 'SpringSource'
-                url = 'http://springsource.org/spring-framework'
-            }
-            licenses {
-                license {
-                    name 'The Apache Software License, Version 2.0'
-                    url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                    distribution 'repo'
-                }
-            }
-            scm {
-                url = 'https://github.com/SpringSource/spring-framework'
-                connection = 'scm:git:git://github.com/SpringSource/spring-framework'
-                developerConnection = 'scm:git:git://github.com/SpringSource/spring-framework'
-            }
-            developers {
-                developer {
-                    id = 'jhoeller'
-                    name = 'Juergen Hoeller'
-                    email = 'jhoeller@vmware.com'
-                }
-            }
-        }
-    }
-}
@@ -1,6 +0,0 @@
-#Thu Nov 01 10:28:17 PDT 2012
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.2-bin.zip
@@ -1,165 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-GRADLE_OPTS="-XX:MaxPermSize=1024m -Xmx1024m $GRADLE_OPTS"
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/"
-APP_HOME="`pwd -P`"
-cd "$SAVED"
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
@@ -1,91 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set GRADLE_OPTS=-XX:MaxPermSize=1024m -Xmx1024m -XX:MaxHeapSize=256m %GRADLE_OPTS%
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
@@ -1,117 +0,0 @@
-@echo off
-set STS_TEST_VERSION='2.9.2.RELEASE'
-
-set CURRENT_DIR=%~dp0
-cd %CURRENT_DIR%
-
-cls
-
-echo.
-echo -----------------------------------------------------------------------
-echo Spring Framework Eclipse/STS project import guide
-echo.
-echo This script will guide you through the process of importing the
-echo Spring Framework sources into Eclipse/STS. It is recommended that you
-echo have a recent version of the SpringSource Tool Suite (this script has
-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://springsource.org/downloads/sts
-echo.
-echo Otherwise, press enter and we'll begin.
-
-pause
-
-REM this command:
-REM - wipes out any existing Eclipse metadata
-REM - generates OXM test classes to avoid errors on import into Eclipse
-REM - generates metadata for all subprojects
-REM - skips metadata gen for the root project (-x :eclipse) to work
-REM   around Eclipse's inability to import hierarchical project structures
-REM SET COMMAND="./gradlew cleanEclipse :spring-oxm:compileTestJava eclipse -x :eclipse"
-SET COMMAND=gradlew cleanEclipse :spring-oxm:compileTestJava eclipse -x :eclipse
-
-echo.
-echo -----------------------------------------------------------------------
-echo STEP 1: Generate subproject Eclipse metadata
-echo. 
-echo The first step will be to generate Eclipse project metadata for each
-echo of the spring-* subprojects. This happens via the built-in
-echo "Gradle wrapper" script (./gradlew in this directory). If this is your
-echo first time using the Gradle wrapper, this step may take a few minutes
-echo while a Gradle distribution is downloaded for you.
-echo. 
-echo The command run will be:
-echo. 
-echo     %COMMAND%
-echo. 
-echo Press enter when ready.
-
-pause
-
-call %COMMAND%
-if not "%ERRORLEVEL%" == "0" exit /B %ERRORLEVEL%
-
-echo.
-echo -----------------------------------------------------------------------
-echo STEP 2: Import subprojects into Eclipse/STS
-echo.
-echo Within Eclipse/STS, do the following:
-echo. 
-echo File ^> Import... ^> Existing Projects into Workspace
-echo      ^> When prompted for the 'root directory', provide %CURRENT_DIR%
-echo      ^> Press enter. You will see the modules show up under "Projects"
-echo      ^> All projects should be selected/checked. Click Finish.
-echo      ^> When the project import is complete, you should have no errors.
-echo.
-echo When the above is complete, return here and press the enter key.
-
-pause
-
-set COMMAND=gradlew :eclipse
-
-echo.
-echo -----------------------------------------------------------------------
-echo STEP 3: generate root project Eclipse metadata
-echo. 
-echo Unfortunately, Eclipse does not allow for importing project
-echo hierarchies, so we had to skip root project metadata generation in the
-echo during step 1. In this step we simply generate root project metadata
-echo so you can import it in the next step.
-echo. 
-echo The command run will be:
-echo. 
-echo     %COMMAND%
-echo. 
-echo Press the enter key when ready.
-pause
-
-call %COMMAND%
-if not "%ERRORLEVEL%" == "0" exit /B %ERRORLEVEL%
-
-echo.
-echo -----------------------------------------------------------------------
-echo STEP 4: Import root project into Eclipse/STS
-echo. 
-echo Follow the project import steps listed in step 2 above to import the
-echo root project.
-echo. 
-echo Press enter when complete, and move on to the final step.
-
-pause
-
-echo.
-echo -----------------------------------------------------------------------
-echo STEP 5: Enable Git support for all projects
-echo. 
-echo - In the Eclipse/STS Package Explorer, select all spring* projects.
-echo - Right-click to open the context menu and select Team ^> Share Project...
-echo - In the Share Project dialog that appears, select Git and press Next
-echo - Check "Use or create repository in parent folder of project"
-echo - Click Finish
-echo. 
-echo When complete, you'll have Git support enabled for all projects.
-echo. 
-echo You're ready to code! Goodbye!
-
@@ -1,120 +0,0 @@
-STS_TEST_VERSION='2.9.2.RELEASE'
-
-cd `dirname $0`
-clear
-cat <<EOM
-
-----------------------------------------------------------------------
-Spring Framework Eclipse/STS project import guide
-
-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.
-
-If you need to download and install STS, please do that now by
-visiting http://springsource.org/downloads/sts
-
-Otherwise, press enter and we'll begin.
-EOM
-
-read
-
-# this command:
-# - wipes out any existing Eclipse metadata
-# - generates OXM test classes to avoid errors on import into Eclipse
-# - generates metadata for all subprojects
-# - skips metadata gen for the root project (-x :eclipse) to work
-#   around Eclipse's inability to import hierarchical project structures
-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 command run will be:
-
-    $COMMAND
-
-Press enter when ready.
-EOM
-
-read
-
-$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.
-
-When the above is complete, return here and press the enter key.
-EOM
-
-read
-
-COMMAND="./gradlew :eclipse"
-
-cat <<EOM
-
-----------------------------------------------------------------------
-STEP 3: generate root project Eclipse metadata
-
-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:
-
-    $COMMAND
-
-Press the enter key when ready.
-EOM
-
-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 project.
-
-Press enter when complete, and move on to the final step.
-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
-
-When complete, you'll have Git support enabled for all projects.
-
-You're ready to code! Goodbye!
-EOM
@@ -1,32 +0,0 @@
-The following has been tested against Intellij IDEA 11.0.1
-
-## Steps
-
-_Within your locally cloned spring-framework working directory:_
-
-1. Generate IDEA metadata with `./gradlew 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. MockServletContext and friends will fail to compile in spring-web. To fix this, uncheck the 'export' setting for all servlet-api and tomcat-servlet-api jars. The problem is that spring-web needs Servlet 2.5, but it's picking up Servlet 3.0 from projects that it depends on.
-2. spring-context will fail to build because there's a duplicate instance of GroovyMessenger in spring-context/src/test/java/org/springframework/scripting/groovy/Messenger.groovy. The solution to this is not known.  It's not a problem on Eclipse, because Eclipse doesn't automatically compile .groovy files like IDEA (apparently) does.
-
-There are no other known problems at this time.  Please add to this list, and if you're ambitious, consider playing with the Gradle IDEA generation DSL to fix these problems automatically, e.g.:
-
-* http://gradle.org/docs/current/dsl/org.gradle.plugins.ide.idea.model.IdeaProject.html
-* http://gradle.org/docs/current/dsl/org.gradle.plugins.ide.idea.model.IdeaModule.html
-* http://gradle.org/docs/current/groovydoc/org/gradle/plugins/ide/idea/model/IdeaModule.html
-
-## Tips
-
-In any case, please do not check in your own generated .iml, .ipr, or .iws files. You'll notice these files are already intentionally in .gitignore. The same policy goes for eclipse metadata.
-
-## FAQ
-
-Q. What about IDEA's own [Gradle support](http://confluence.jetbrains.net/display/IDEADEV/Gradle+integration)?
-
-A. Unknown. Please report back if you try it and it goes well for you.
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.beans"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.core"/>
+	<classpathentry kind="var" path="IVY_CACHE/com.jamonapi/com.springsource.com.jamonapi/2.4.0/com.springsource.com.jamonapi-2.4.0.jar" sourcepath="/IVY_CACHE/com.jamonapi/com.springsource.com.jamonapi/2.4.0/com.springsource.com.jamonapi-sources-2.4.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.2.0/com.springsource.net.sf.cglib-2.2.0.jar" sourcepath="/IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-sources-2.1.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.pool/1.3.0/com.springsource.org.apache.commons.pool-1.3.0.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.pool/1.3.0/com.springsource.org.apache.commons.pool-sources-1.3.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-1.2.15.jar" sourcepath="/IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-sources-1.2.15.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.8.RELEASE/com.springsource.org.aspectj.weaver-1.6.8.RELEASE.jar" sourcepath="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.8.RELEASE/com.springsource.org.aspectj.weaver-sources-1.6.8.RELEASE.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.5.1/com.springsource.org.easymock-2.5.1.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.5.1/com.springsource.org.easymock-sources-2.5.1.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.9.0/com.springsource.org.junit-4.9.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.9.0/com.springsource.org.junit-sources-4.9.0.jar"/>
+	<classpathentry kind="lib" path="/org.springframework.asm/target/artifacts/org.springframework.asm.jar" sourcepath="/org.springframework.asm/target/artifacts/org.springframework.asm-sources.jar"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.springframework.aop</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
@@ -0,0 +1,268 @@
+#Wed Jul 15 00:01:31 PDT 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=80
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
@@ -0,0 +1,4 @@
+#Fri Dec 12 11:37:26 PST 2008
+eclipse.preferences.version=1
+formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
+formatter_settings_version=11
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="module" module-name="beans" />
+    <orderEntry type="module" module-name="core" />
+    <orderEntry type="library" name="AOP Alliance" level="project" />
+    <orderEntry type="library" name="AspectJ" level="project" />
+    <orderEntry type="library" name="CGLIB" level="project" />
+    <orderEntry type="library" name="Commons Logging" level="project" />
+    <orderEntry type="library" name="Commons Pool" level="project" />
+    <orderEntry type="library" name="EasyMock" level="project" />
+    <orderEntry type="library" name="Jamon" level="project" />
+    <orderEntry type="library" name="JUnit" level="project" />
+    <orderEntry type="library" name="Log4j" level="project" />
+  </component>
+  <component name="copyright">
+    <Base>
+      <setting name="state" value="2" />
+    </Base>
+  </component>
+</module>
+
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="org.springframework.aop">
+	<property file="${basedir}/../build.properties"/>
+	<property file="${basedir}/../build.versions"/>
+	<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
+	<import file="${basedir}/../spring-build/standard/default.xml"/>
+</project>
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
+<ivy-module
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
+		version="1.3">
+
+	<info organisation="org.springframework" module="${ant.project.name}">
+		<license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/>
+	</info>
+
+	<configurations>
+		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+		<conf name="commons-logging" extends="runtime" description="JARs needed to run with Commons Logging"/>
+		<conf name="aspectj" extends="runtime" description="JARs needed to run with AspectJ"/>
+		<conf name="bytecode-proxy" extends="runtime" description="JARs needed to run with CGLIB bytecode proxies"/>
+		<conf name="jamon" extends="runtime" description="JARs needed to run with JamonAPI"/>
+		<conf name="pooling" extends="runtime" description="JARs needed to run the pooling target source"/>
+	</configurations>
+
+	<publications>
+		<artifact name="${ant.project.name}"/>
+		<artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
+		<artifact name="license" type="license" ext="txt"/>
+		<artifact name="notice" type="notice" ext="txt"/>
+	</publications>
+
+	<dependencies>
+		<dependency org="com.jamonapi" name="com.springsource.com.jamonapi" rev="2.4.0" conf="optional, jamon->compile"/>
+		<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.2.0" conf="optional, bytecode-proxy->compile"/>
+		<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="1.5.3" conf="optional, pooling->compile"/>
+		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
+		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
+		<!-- test dependencies -->
+		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
+		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
+		<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>
+	</dependencies>
+
+</ivy-module>
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.springframework</groupId>
+  <artifactId>spring-aop</artifactId>
+  <packaging>jar</packaging>
+  <version>3.1.5.BUILD-SNAPSHOT</version>
+  <parent>
+    <groupId>org.springframework</groupId>
+    <artifactId>spring-parent</artifactId>
+    <relativePath>../org.springframework.spring-parent</relativePath>
+    <version>3.1.5.BUILD-SNAPSHOT</version>
+  </parent>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <dependencies>
+    <dependency>
+      <groupId>com.jamonapi</groupId>
+      <artifactId>jamon</artifactId>
+      <version>2.4</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>2.2</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>aopalliance</groupId>
+      <artifactId>aopalliance</artifactId>
+      <version>1.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <!-- common logging dependency is in spring-core -->
+    <dependency>
+      <groupId>commons-pool</groupId>
+      <artifactId>commons-pool</artifactId>
+      <version>1.5.3</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>aspectjweaver</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-asm</artifactId>
+      <version>${project.version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>${project.version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>${project.version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -681,6 +681,23 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 		public boolean matches(Method method, Class targetClass) {
 			return !this.adviceMethod.equals(method);
 		}
+
+		@Override
+		public boolean equals(Object other) {
+			if (this == other) {
+				return true;
+			}
+			if (!(other instanceof AdviceExcludingMethodMatcher)) {
+				return false;
+			}
+			AdviceExcludingMethodMatcher otherMm = (AdviceExcludingMethodMatcher) other;
+			return this.adviceMethod.equals(otherMm.adviceMethod);
+		}
+
+		@Override
+		public int hashCode() {
+			return this.adviceMethod.hashCode();
+		}
 	}

 }
--- a/Show More
+++ b/Show More