Update JavaScriptUtils

Add escaping for <, >, and PS/LS line terminators

Issue: SPR-9983

.gitignore

@@ -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

.settings/gradle/com.springsource.sts.gradle.core.import.prefs

@@ -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;

.settings/gradle/com.springsource.sts.gradle.core.prefs

@@ -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=

.settings/gradle/com.springsource.sts.gradle.refresh.prefs

@@ -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;

README.md

@@ -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.6+.
-
-### 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/wiki/Contributor-guidelines
-[@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).

build-spring-framework/build.iml

@@ -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>
+

build-spring-framework/build.xml

@@ -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>

build-spring-framework/package-bundle.xml

@@ -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>

build-spring-framework/package-library.xml

@@ -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>

build-spring-framework/package-top-level.xml

@@ -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>

build-spring-framework/publish-documentation.xml

@@ -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>

build-spring-framework/publish-top-level.xml

@@ -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>

build-spring-framework/readme.txt

@@ -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

build-spring-framework/resources/changelog.txt

@@ -1,99 +1,120 @@
 SPRING FRAMEWORK CHANGELOG
-===========================
+==========================
 http://www.springsource.org
 
 
-Changes in version 3.2 M2 (2012-09-11)
---------------------------------------
+Changes in version 3.1.4 (2013-01-23)
+-------------------------------------
 
-* 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 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
-* DeferredResult type is now parameterized
-* now using reflection to instantiate StandardServletAsyncWebRequest
-* fixed issue with forward before async request processing
-* 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 content negotiation options in MVC namespace and MVC Java config
-* 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)
+* 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)
+* 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 M1 (2012-05-28)
---------------------------------------
+Changes in version 3.1.3 (2012-10-31)
+-------------------------------------
 
-* 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
+* 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.1.2 (2012-07-09)
+-------------------------------------
+
+* 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)

build-spring-framework/resources/license.txt

@@ -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.

build-spring-framework/resources/notice.txt

@@ -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.

build-spring-framework/resources/readme.txt

@@ -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.

build.gradle

@@ -1,763 +0,0 @@
-buildscript {
-    repositories {
-        maven { url 'http://repo.springsource.org/plugins-release' }
-    }
-    dependencies {
-        classpath 'org.springframework.build.gradle:docbook-reference-plugin:0.1.5'
-    }
-}
-
-configure(allprojects) {
-    apply plugin: 'java'
-    apply plugin: 'eclipse'
-    apply plugin: 'idea'
-
-    group = 'org.springframework'
-
-    sourceCompatibility=1.5
-    targetCompatibility=1.5
-
-    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
-
-    [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.1"
-        testCompile "org.easymock:easymock:2.5.1"
-    }
-
-    // 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
-    eclipse.classpath.file.whenMerged { classpath ->
-        classpath.entries.findAll { entry -> entry.path.contains('servlet-api') }*.exported = false
-    }
-}
-
-configure(subprojects - project(":spring-test")) {
-    dependencies {
-        testCompile ("junit:junit-dep:${junitVersion}") {
-            exclude group: 'org.hamcrest', module: 'hamcrest-core'
-        }
-    }
-}
-
-configure(subprojects) { subproject ->
-    apply from: "${rootProject.projectDir}/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.jruby:jruby:1.4.0", 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("javax.cache:cache-api:0.5", optional)
-        compile("net.sf.ehcache:ehcache-core:2.0.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)
-    }
-}
-
-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("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.8", 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-core:4.1.0.Final", 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:4.1.0.Final", 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-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.8", 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-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-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'
-
-    reference {
-        sourceDir = file('src/reference/docbook')
-    }
-
-    // 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'
-        classifier = 'docs'
-        description = "Builds -${classifier} archive containing api and reference " +
-            "for deployment at 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'
-        classifier = 'schema'
-        description = "Builds -${classifier} archive containing all " +
-            "XSDs for deployment at static.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'
-        classifier = 'dist'
-        description = "Builds -${classifier} archive, containing all jars and docs, " +
-                      "suitable for community download page."
-
-        ext.baseDir = "${project.name}-${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'
-        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.1'
-    }
-}
-

build.properties

@@ -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

build.versions

@@ -0,0 +1,4 @@
+# common dependency versions
+aspectj.version=1.6.8.RELEASE
+junit.version=4.9.0
+testng.version=5.12.1

ci-build.properties

@@ -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

eclipse-code-formatter.xml

@@ -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>

gradle.properties

@@ -1 +0,0 @@
-version=3.2.0.M2

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +0,0 @@
-#Tue Aug 07 14:52:15 CEST 2012
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.1-bin.zip

gradlew

@@ -1,168 +0,0 @@
-#!/bin/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.
-DEFAULT_JVM_OPTS=""
-
-# ADDED BY HAND -- DO NOT ACCIDENTALLY DELETE WHEN UPGRADING GRADLE WRAPPER!
-GRADLE_OPTS="-XX:MaxPermSize=1024m -Xmx1024m $GRADLE_OPTS"
-# END ADDED BY HAND
-
-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 businessSystem 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 "$@"

gradlew.bat

@@ -1,94 +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 DEFAULT_JVM_OPTS=
-
-@rem ADDED BY HAND -- DO NOT ACCIDENTALLY DELETE WHEN UPGRADING GRADLE WRAPPER!
-set GRADLE_OPTS=-XX:MaxPermSize=1024m -Xmx1024m -XX:MaxHeapSize=256m %GRADLE_OPTS%
-@rem END ADDED BY HAND
-
-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

import-into-eclipse.sh

@@ -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

import-into-idea.md

@@ -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.

org.springframework.aop/.classpath

@@ -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>

org.springframework.aop/.project

@@ -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>

org.springframework.aop/.settings/org.eclipse.jdt.core.prefs

@@ -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

org.springframework.aop/.settings/org.eclipse.jdt.ui.prefs

@@ -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

org.springframework.aop/aop.iml

@@ -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>
+

org.springframework.aop/build.xml

@@ -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>

org.springframework.aop/ivy.xml

@@ -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>

org.springframework.aop/pom.xml

@@ -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>

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

@@ -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();
+		}
 	}
 
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2007 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,20 +16,14 @@
 
 package org.springframework.aop.aspectj.annotation;
 
-import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
 
 import org.aopalliance.aop.Advice;
-import org.aspectj.lang.annotation.After;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.AfterThrowing;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.DeclareParents;
 import org.aspectj.lang.annotation.Pointcut;
 
@@ -46,12 +40,8 @@ import org.springframework.aop.aspectj.DeclareParentsAdvisor;
 import org.springframework.aop.framework.AopConfigException;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
 import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.core.convert.converter.ConvertingComparator;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.util.comparator.CompoundComparator;
-import org.springframework.util.comparator.InstanceComparator;
 
 /**
  * Factory that can create Spring AOP Advisors given AspectJ classes from
@@ -62,34 +52,10 @@ import org.springframework.util.comparator.InstanceComparator;
  * @author Adrian Colyer
  * @author Juergen Hoeller
  * @author Ramnivas Laddad
- * @author Phillip Webb
  * @since 2.0
  */
 public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFactory {
 
-	private static final Comparator<Method> METHOD_COMPARATOR;
-
-	static {
-		CompoundComparator<Method> comparator = new CompoundComparator<Method>();
-		comparator.addComparator(new ConvertingComparator<Method, Annotation>(
-				new InstanceComparator<Annotation>(
-						Around.class, Before.class, After.class, AfterReturning.class, AfterThrowing.class),
-				new Converter<Method, Annotation>() {
-					public Annotation convert(Method method) {
-						AspectJAnnotation<?> annotation = AbstractAspectJAdvisorFactory.findAspectJAnnotationOnMethod(method);
-						return annotation == null ? null : annotation.getAnnotation();
-					}
-				}));
-		comparator.addComparator(new ConvertingComparator<Method, String>(
-				new Converter<Method, String>() {
-					public String convert(Method method) {
-						return method.getName();
-					}
-				}));
-		METHOD_COMPARATOR = comparator;
-	}
-
-
 	public List<Advisor> getAdvisors(MetadataAwareAspectInstanceFactory maaif) {
 		final Class<?> aspectClass = maaif.getAspectMetadata().getAspectClass();
 		final String aspectName = maaif.getAspectMetadata().getAspectName();
@@ -101,12 +67,17 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 				new LazySingletonAspectInstanceFactoryDecorator(maaif);
 
 		final List<Advisor> advisors = new LinkedList<Advisor>();
-		for (Method method : getAdvisorMethods(aspectClass)) {
-			Advisor advisor = getAdvisor(method, lazySingletonAspectInstanceFactory, advisors.size(), aspectName);
-			if (advisor != null) {
-				advisors.add(advisor);
+		ReflectionUtils.doWithMethods(aspectClass, new ReflectionUtils.MethodCallback() {
+			public void doWith(Method method) throws IllegalArgumentException {
+				// Exclude pointcuts
+				if (AnnotationUtils.getAnnotation(method, Pointcut.class) == null) {
+					Advisor advisor = getAdvisor(method, lazySingletonAspectInstanceFactory, advisors.size(), aspectName);
+					if (advisor != null) {
+						advisors.add(advisor);
+					}
+				}
 			}
-		}
+		});
 
 		// If it's a per target aspect, emit the dummy instantiating aspect.
 		if (!advisors.isEmpty() && lazySingletonAspectInstanceFactory.getAspectMetadata().isLazilyInstantiated()) {
@@ -125,20 +96,6 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 		return advisors;
 	}
 
-	private List<Method> getAdvisorMethods(Class<?> aspectClass) {
-		final List<Method> methods = new LinkedList<Method>();
-		ReflectionUtils.doWithMethods(aspectClass, new ReflectionUtils.MethodCallback() {
-			public void doWith(Method method) throws IllegalArgumentException {
-				// Exclude pointcuts
-				if (AnnotationUtils.getAnnotation(method, Pointcut.class) == null) {
-					methods.add(method);
-				}
-			}
-		});
-		Collections.sort(methods, METHOD_COMPARATOR);
-		return methods;
-	}
-
 	/**
 	 * Build a {@link org.springframework.aop.aspectj.DeclareParentsAdvisor}
 	 * for the given introduction field.
@@ -147,7 +104,7 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 	 * @return <code>null</code> if not an Advisor
 	 */
 	private Advisor getDeclareParentsAdvisor(Field introductionField) {
-		DeclareParents declareParents = introductionField.getAnnotation(DeclareParents.class);
+		DeclareParents declareParents = (DeclareParents) introductionField.getAnnotation(DeclareParents.class);
 		if (declareParents == null) {
 			// Not an introduction field
 			return null;
@@ -267,7 +224,6 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 	 * Triggered by per-clause pointcut on non-singleton aspect.
 	 * The advice has no effect.
 	 */
-	@SuppressWarnings("serial")
 	protected static class SyntheticInstantiationAdvisor extends DefaultPointcutAdvisor {
 
 		public SyntheticInstantiationAdvisor(final MetadataAwareAspectInstanceFactory aif) {