[java-identity-provider COMMIT] in /trunk: idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relying...

[noreply at shibboleth.net]

Author: putmanb
Date: Mon Dec 15 18:15:02 2014
New Revision: 7106

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7106&view=rev
Log:
Update schema and parsers for metadata providers so HttpClient caching-related attribs have http- prefix, to better disambiguate them from other attribs.
Add parser unit tests.

Added:
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntity-httpCaching-file.xml   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntity-httpCaching-memory.xml   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntity-httpCaching-none.xml   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-httpCaching-file.xml   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-httpCaching-memory.xml   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-httpCaching-none.xml   (with props)
Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractDynamicHTTPMetadataProviderParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParser.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/DynamicHTTPMetadataProviderParserTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParserTest.java
    trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractDynamicHTTPMetadataProviderParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractDynamicHTTPMetadataProviderParser.java?rev=7106&r1=7105&r2=7106&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractDynamicHTTPMetadataProviderParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractDynamicHTTPMetadataProviderParser.java Mon Dec 15 18:15:02 2014
@@ -111,25 +111,28 @@
                 break;
             case "file":
                 clientBuilder = BeanDefinitionBuilder.genericBeanDefinition(FileCachingHttpClientFactoryBean.class);
-                if (element.hasAttributeNS(null, "cacheDirectory")) {
-                    clientBuilder.addPropertyValue("cacheDirectory", element.getAttributeNS(null, "cacheDirectory"));
+                if (element.hasAttributeNS(null, "httpCacheDirectory")) {
+                    clientBuilder.addPropertyValue("cacheDirectory", 
+                            element.getAttributeNS(null, "httpCacheDirectory"));
                 }
-                if (element.hasAttributeNS(null, "maxCacheEntries")) {
-                    clientBuilder.addPropertyValue("maxCacheEntries", element.getAttributeNS(null, "maxCacheEntries"));
+                if (element.hasAttributeNS(null, "httpMaxCacheEntries")) {
+                    clientBuilder.addPropertyValue("maxCacheEntries", 
+                            element.getAttributeNS(null, "httpMaxCacheEntries"));
                 }
-                if (element.hasAttributeNS(null, "maxCacheEntrySize")) {
+                if (element.hasAttributeNS(null, "httpMaxCacheEntrySize")) {
                     clientBuilder.addPropertyValue("maxCacheEntrySize", 
-                            element.getAttributeNS(null, "maxCacheEntrySize"));
+                            element.getAttributeNS(null, "httpMaxCacheEntrySize"));
                 }
                 break;
             case "memory":
                 clientBuilder = BeanDefinitionBuilder.genericBeanDefinition(InMemoryCachingHttpClientFactoryBean.class);
-                if (element.hasAttributeNS(null, "maxCacheEntries")) {
-                    clientBuilder.addPropertyValue("maxCacheEntries", element.getAttributeNS(null, "maxCacheEntries"));
+                if (element.hasAttributeNS(null, "httpMaxCacheEntries")) {
+                    clientBuilder.addPropertyValue("maxCacheEntries", 
+                            element.getAttributeNS(null, "httpMaxCacheEntries"));
                 }
-                if (element.hasAttributeNS(null, "maxCacheEntrySize")) {
+                if (element.hasAttributeNS(null, "httpMaxCacheEntrySize")) {
                     clientBuilder.addPropertyValue("maxCacheEntrySize", 
-                            element.getAttributeNS(null, "maxCacheEntrySize"));

[... 239 lines stripped ...]