[spring-extensions] branch master updated (90a6110 -> 958d3d5)

[Ian Young]

This is an automated email from the git hooks/post-receive script.

iay pushed a change to branch master
in repository spring-extensions.

      from  90a6110   Javadoc fixes
       new  c3d6737   JSE-24 - Conditional resource type
       new  8e566c6   JSE-24 - Conditional resource type
       new  958d3d5   Default support for ConditionalResource resolution in Spring contexts.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../FileSystemXmlWebApplicationContext.java        |  11 +-
 .../FilesystemGenericApplicationContext.java       |   5 +-
 .../ext/spring/resource/ConditionalResource.java   | 225 +++++++++++++++++++++
 .../resource/ConditionalResourceResolver.java      |  69 +++++++
 .../ext/spring/util/ApplicationContextBuilder.java |   1 +
 .../spring/resource/ConditionalResourceTest.java   | 172 ++++++++++++++++
 .../ext/spring/resource/conditional-import.xml     |  14 ++
 .../conditional.xml}                               |  12 +-
 8 files changed, 500 insertions(+), 9 deletions(-)
 create mode 100644 src/main/java/net/shibboleth/ext/spring/resource/ConditionalResource.java
 create mode 100644 src/main/java/net/shibboleth/ext/spring/resource/ConditionalResourceResolver.java
 create mode 100644 src/test/java/net/shibboleth/ext/spring/resource/ConditionalResourceTest.java
 create mode 100644 src/test/resources/net/shibboleth/ext/spring/resource/conditional-import.xml
 copy src/test/resources/net/shibboleth/ext/spring/{service/ServiceableBean2.xml => resource/conditional.xml} (51%)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.