[utilities COMMIT] in /spring-extensions/trunk/src: main/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBea...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Dec 16 11:00:28 2013
New Revision: 488

URL: http://svn.shibboleth.net/view/utilities?rev=488&view=rev
Log:
IDP-209 Add a support class to convert from Spring Resources to ShibbolethResources.  Fix a couple of tests that used old-style ShibbolethResources to use Spring ones.

Added:
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/resource/
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/resource/ShibbolethResourceHelper.java   (with props)
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/resource/package-info.java   (with props)
Modified:
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBean.java
    spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBeanTest.java

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBean.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBean.java?rev=488&r1=487&r2=488&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBean.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBean.java Mon Dec 16 11:00:28 2013
@@ -20,11 +20,11 @@
 import javax.annotation.Nonnull;
 
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.resource.Resource;
 import net.shibboleth.utilities.java.support.xml.BasicParserPool;
 
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.FactoryBean;
+import org.springframework.core.io.Resource;
 import org.w3c.dom.Document;
 
 /** Spring bean factory for producing a {@link Document} from a resource. */

Modified: spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBeanTest.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBeanTest.java?rev=488&r1=487&r2=488&view=diff
==============================================================================
--- spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBeanTest.java (original)
+++ spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBeanTest.java Mon Dec 16 11:00:28 2013
@@ -17,10 +17,10 @@
 
 package net.shibboleth.ext.spring.factory;
 
-import net.shibboleth.utilities.java.support.resource.ClasspathResource;
-import net.shibboleth.utilities.java.support.resource.Resource;
 import net.shibboleth.utilities.java.support.xml.BasicParserPool;
 
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
@@ -37,8 +37,7 @@
     @Test
     public void getObject() throws Exception {
         DomDocumentFactoryBean factory = new DomDocumentFactoryBean();
-        Resource resource = new ClasspathResource("data/document.xml");
-        resource.initialize();
+        Resource resource = new ClassPathResource("data/document.xml");
         BasicParserPool pool = new BasicParserPool();
         pool.initialize();
         factory.setDocumentResource(resource);