Merge 3.1.0 development branch into trunk

Branch in question is 'env' branch from git://git.springsource.org/sandbox/cbeams.git; merged into
git-svn repository with:

    git merge -s recursive -Xtheirs --no-commit env

No merge conflicts, but did need to

    git rm spring-build

prior to committing.

With this change, Spring 3.1.0 development is now happening on SVN
trunk. Further commits to the 3.0.x line will happen in an as-yet
uncreated SVN branch.  3.1.0 snapshots will be available
per the usual nightly CI build from trunk.

org.springframework.transaction/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java

@@ -166,6 +166,7 @@ public class SpringContextResourceAdapter implements ResourceAdapter {
 				new ResourceAdapterApplicationContext(bootstrapContext);
 		// Set ResourceAdapter's ClassLoader as bean class loader.
 		applicationContext.setClassLoader(getClass().getClassLoader());
+		// TODO: SPR-7508 consider setEnvironment() here
 		// Extract individual config locations.
 		String[] configLocations =
 				StringUtils.tokenizeToStringArray(getContextConfigLocation(), CONFIG_LOCATION_DELIMITERS);
@@ -184,6 +185,7 @@ public class SpringContextResourceAdapter implements ResourceAdapter {
 	 * @see #setContextConfigLocation
 	 */
 	protected void loadBeanDefinitions(BeanDefinitionRegistry registry, String[] configLocations) {
+		// TODO: SPR-7508 consider setEnvironment() here
 		new XmlBeanDefinitionReader(registry).loadBeanDefinitions(configLocations);
 	}