[java-identity-provider COMMIT] in /trunk: idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/fil...

[noreply at shibboleth.net]

Author: rdw
Date: Sun Nov 24 09:44:19 2013
New Revision: 4965

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4965&view=rev
Log:
IdP-298 Use Spring resources to configure the IdP (including a lot of reundant code)

Modified:
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverService.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractSpringReloadableService.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractSpringService.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/spring/SpringSupport.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/spring/resource/ClasspathResourceBeanDefinitionParser.java

Modified: trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java?rev=4965&r1=4964&r2=4965&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java (original)
+++ trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java Sun Nov 24 09:44:19 2013
@@ -28,10 +28,10 @@
 import net.shibboleth.idp.attribute.filter.spring.AttributeFilterService;
 import net.shibboleth.idp.service.ServiceException;
 import net.shibboleth.idp.spring.SpringSupport;
-import net.shibboleth.utilities.java.support.resource.ClasspathResource;
-import net.shibboleth.utilities.java.support.resource.Resource;
 
 import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -92,7 +92,7 @@
     @Test public void testPolicy2() throws ServiceException, AttributeFilterException {
 
         AttributeFilterService service =
-                AttributeFilterServiceTest.newService("policy2", new ClasspathResource(SERVICE_CONFIG_FILE));
+                AttributeFilterServiceTest.newService("policy2", new ClassPathResource(SERVICE_CONFIG_FILE));
 
         AttributeFilterContext filterContext = new AttributeFilterContext();
         filterContext.setPrefilteredIdPAttributes(attributesToBeFiltered.values());
@@ -121,7 +121,7 @@
     @Test public void testPolicy3() throws ServiceException, AttributeFilterException {
 
         AttributeFilterService service =
-                AttributeFilterServiceTest.newService("policy3", new ClasspathResource(SERVICE_CONFIG_FILE));
+                AttributeFilterServiceTest.newService("policy3", new ClassPathResource(SERVICE_CONFIG_FILE));
 
         AttributeFilterContext filterContext = new AttributeFilterContext();
         filterContext.setPrefilteredIdPAttributes(attributesToBeFiltered.values());
@@ -150,7 +150,7 @@
 
 
         AttributeFilterService service =
-                AttributeFilterServiceTest.newService("policy4", new ClasspathResource(SERVICE_CONFIG_FILE));
+                AttributeFilterServiceTest.newService("policy4", new ClassPathResource(SERVICE_CONFIG_FILE));
 
         AttributeFilterContext filterContext = new AttributeFilterContext();
         filterContext.setPrefilteredIdPAttributes(attributesToBeFiltered.values());

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverService.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverService.java?rev=4965&r1=4964&r2=4965&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverService.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverService.java Sun Nov 24 09:44:19 2013
@@ -21,15 +21,14 @@
 
 import javax.annotation.Nonnull;
 
+import net.shibboleth.idp.attribute.resolver.AttributeDefinition;
 import net.shibboleth.idp.attribute.resolver.AttributeResolutionContext;
 import net.shibboleth.idp.attribute.resolver.AttributeResolver;
-import net.shibboleth.idp.attribute.resolver.AttributeDefinition;
 import net.shibboleth.idp.attribute.resolver.DataConnector;
 import net.shibboleth.idp.attribute.resolver.ResolutionException;
 import net.shibboleth.idp.service.AbstractSpringService;
 import net.shibboleth.idp.service.ServiceException;

[... 233 lines stripped ...]