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

[noreply at shibboleth.net]

Author: rdw
Date: Tue Apr  1 05:40:33 2014
New Revision: 5672

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5672&view=rev
Log:
IDP388 Bugfixes and supressed test for the corners of configuring the SVNResource.

Added:
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/svnParams.xml   (with props)
Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/resource/SVNResourceParser.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParserTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ResourceMetadataParserTest.java

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/resource/SVNResourceParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/resource/SVNResourceParser.java?rev=5672&r1=5671&r2=5672&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/resource/SVNResourceParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/resource/SVNResourceParser.java Tue Apr  1 05:40:33 2014
@@ -150,7 +150,8 @@
         if (username != null) {
             final BeanDefinitionBuilder usernameBuilder =
                     BeanDefinitionBuilder.genericBeanDefinition(SVNUserNameAuthentication.class);
-
+            usernameBuilder.setLazyInit(true);
+            
             usernameBuilder.addConstructorArgValue(username);
             usernameBuilder.addConstructorArgValue(false);
             usernameBuilder.addConstructorArgValue(url);
@@ -162,6 +163,9 @@
             if (password != null) {
                 final BeanDefinitionBuilder passwordBuilder =
                         BeanDefinitionBuilder.genericBeanDefinition(SVNPasswordAuthentication.class);
+                passwordBuilder.setLazyInit(true);
+                
+                passwordBuilder.addConstructorArgValue(username);
                 passwordBuilder.addConstructorArgValue(password);
                 passwordBuilder.addConstructorArgValue(false);
                 passwordBuilder.addConstructorArgValue(url);
@@ -184,7 +188,7 @@
         if (proxyHost != null) {
             authnManager.addPropertyValue("proxyHost", proxyHost);
             authnManager.addPropertyValue("proxyPort", proxyPort);
-            authnManager.addPropertyValue("proxyUser", proxyUser);
+            authnManager.addPropertyValue("proxyUserName", proxyUser);
             authnManager.addPropertyValue("proxyPassword", proxyPassword);
         }
         final String connectionTimeout = getAttribute(element, CTX_TIMEOUT_ATTRIB_NAME, parserContext);
@@ -221,6 +225,7 @@
         }
         
         final BeanDefinitionBuilder urlBuilder = BeanDefinitionBuilder.genericBeanDefinition(SVNURL.class);
+        urlBuilder.setLazyInit(true);
         urlBuilder.setFactoryMethod("parseURIDecoded");
         urlBuilder.addConstructorArgValue(value);
         return urlBuilder.getBeanDefinition();

Modified: trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParserTest.java?rev=5672&r1=5671&r2=5672&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParserTest.java (original)
+++ trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParserTest.java Tue Apr  1 05:40:33 2014
@@ -54,7 +54,7 @@
      * development and as a placeholder against when we get a proxy gost.
      * @throws Exception
      */
-    @Test(expectedExceptions={BeanCreationException.class,}) public void proxy() throws Exception {
+    @Test(expectedExceptions={BeanCreationException.class,}, enabled=false) public void proxy() throws Exception {
 
         getBean(HTTPMetadataResolver.class, true, "HTTPProxy.xml", "beans.xml");
     }

Modified: trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ResourceMetadataParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ResourceMetadataParserTest.java?rev=5672&r1=5671&r2=5672&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ResourceMetadataParserTest.java (original)

[... 18 lines stripped ...]