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

[noreply at shibboleth.net]

Author: iay
Date: Wed Mar 21 11:43:58 2012
New Revision: 253

URL: http://svn.shibboleth.net/view/utilities?rev=253&view=rev
Log:
Port from opensaml-util to java-support.

Modified:
    spring-extensions/trunk/pom.xml
    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/pom.xml
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/pom.xml?rev=253&r1=252&r2=253&view=diff
==============================================================================
--- spring-extensions/trunk/pom.xml (original)
+++ spring-extensions/trunk/pom.xml Wed Mar 21 11:43:58 2012
@@ -57,9 +57,9 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.opensaml</groupId>
-            <artifactId>opensaml-util</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <groupId>net.shibboleth.utilities</groupId>
+            <artifactId>java-support</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
             <!-- Required for the DomDocumentFactoryBean class -->
             <optional>true</optional>
         </dependency>

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=253&r1=252&r2=253&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 Wed Mar 21 11:43:58 2012
@@ -17,8 +17,9 @@
 
 package net.shibboleth.ext.spring.factory;
 
-import org.opensaml.util.resource.Resource;
-import org.opensaml.util.xml.BasicParserPool;
+import net.shibboleth.utilities.java.support.resource.Resource;
+import net.shibboleth.utilities.java.support.xml.BasicParserPool;
+
 import org.springframework.beans.factory.FactoryBean;
 import org.w3c.dom.Document;
 

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=253&r1=252&r2=253&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 Wed Mar 21 11:43:58 2012
@@ -17,9 +17,10 @@
 
 package net.shibboleth.ext.spring.factory;
 
-import org.opensaml.util.resource.ClasspathResource;
-import org.opensaml.util.resource.Resource;
-import org.opensaml.util.xml.BasicParserPool;
+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.testng.Assert;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
@@ -37,6 +38,7 @@
     public void getObject() throws Exception {
         DomDocumentFactoryBean factory = new DomDocumentFactoryBean();
         Resource resource = new ClasspathResource("data/document.xml");
+        resource.initialize();
         BasicParserPool pool = new BasicParserPool();
         pool.initialize();
         factory.setDocumentResource(resource);