[java-shib-attribute] 01/02: JSATTR-4 Remove springResources from data connector
Rod Widdowson
rdw at steadingsoftware.com
Wed Oct 26 15:58:56 UTC 2022
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch main
in repository java-shib-attribute.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-attribute.git;a=commit;h=1032cd0c50191934ca26804c37d67ef05d3bfba1
commit 1032cd0c50191934ca26804c37d67ef05d3bfba1
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Oct 26 16:38:53 2022 +0100
JSATTR-4 Remove springResources from data connector
https://shibboleth.atlassian.net/browse/JSATTR-4
Remove from the schema and the tests. Minimal structural changes to the code in this change
---
.../spring/dc/AbstractDataConnectorParser.java | 73 +---------------------
.../dc/impl/ScriptedDataConnectorParser.java | 5 --
.../schema/shibboleth-attribute-resolver.xsd | 23 -------
.../dc/impl/StaticDataConnectorParserTest.java | 16 -----
.../dc/impl/StoredIdDataConnectorParserTest.java | 1 -
.../dc/ldap/impl/LDAPDataConnectorParserTest.java | 35 -----------
.../rdbms/impl/RDBMSDataConnectorParserTest.java | 16 -----
...dap-attribute-resolver-spring-props-context.xml | 71 ---------------------
.../ldap-attribute-resolver-spring-props.xml | 12 ----
.../resolver/ldap-attribute-resolver-spring.xml | 13 ----
...bms-attribute-resolver-spring-props-context.xml | 28 ---------
.../rdbms-attribute-resolver-spring-props.xml | 12 ----
.../resolver/rdbms-attribute-resolver-spring.xml | 12 ----
.../spring/dc/resolver/staticAttributesHybrid.xml | 6 --
.../dc/resolver/staticAttributesHybridSpring.xml | 26 --------
.../attribute/resolver/spring/externalBeans.xml | 5 --
16 files changed, 1 insertion(+), 353 deletions(-)
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java
index e1339ad8d..c448bdb4e 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java
@@ -55,27 +55,6 @@ public abstract class AbstractDataConnectorParser extends BaseResolverPluginPars
/** Delay in retrying failed connector. */
@Nonnull @NotEmpty public static final String ATTR_NORETRYDELAY = "noRetryDelay";
- /** semi colon separated resources to indicate external config. */
- @Nonnull @NotEmpty public static final String ATTR_SPRING_RESOURCE = "springResources";
-
- /**
- * A bean name for a {@link java.util.Collection}<code><</code>
- * {@link org.springframework.core.io.Resource}<code>></code>.
- */
- @Nonnull @NotEmpty public static final String ATTR_SPRING_RESOURCE_REF = "springResourcesRef";
-
- /**
- * A bean name for a {@link List}<code><</code>
- * {@link org.springframework.beans.factory.config.BeanFactoryPostProcessor}<code>></code>.
- */
- @Nonnull @NotEmpty public static final String ATTR_FACTORY_POSTPROCESSORS_REF = "factoryPostProcessorsRef";
-
- /**
- * A bean name for a {@link List}<code><</code>
- * {@link org.springframework.beans.factory.config.BeanPostProcessor}<code>></code>.
- */
- @Nonnull @NotEmpty public static final String ATTR_POSTPROCESSORS_REF = "postProcessorsRef";
-
/**
* Whether to export all attributes.
*/
@@ -98,22 +77,8 @@ public abstract class AbstractDataConnectorParser extends BaseResolverPluginPars
/** Log4j logger. */
@Nonnull private final Logger log = LoggerFactory.getLogger(AbstractDataConnectorParser.class);
- /**
- * Returns whether the element configuration is native spring or custom.
- *
- * @param config the element under consideration.
- * @return whether this is native spring
- */
- protected boolean isNative(@Nonnull final Element config) {
- return config.hasAttributeNS(null, ATTR_SPRING_RESOURCE)
- || config.hasAttributeNS(null, ATTR_SPRING_RESOURCE_REF);
- }
-
/** {@inheritDoc} */
@Override protected final Class<?> getBeanClass(final Element element) {
- if (isNative(element)) {
- return DataConnectorFactoryBean.class;
- }
return getNativeBeanClass();
}
@@ -167,43 +132,7 @@ public abstract class AbstractDataConnectorParser extends BaseResolverPluginPars
StringSupport.trimOrNull(config.getAttributeNS(null, ATTR_FAIL_FAST)));
}
- if (isNative(config)) {
- // parse the configuration into a beanfactory and inject the resources as well
- builder.addPropertyValue("objectType", getNativeBeanClass());
- // it's a factory bean so we use the spring lifecycle directly
- builder.setInitMethodName(null);
- builder.setDestroyMethodName(null);
- if (config.hasAttributeNS(null, ATTR_SPRING_RESOURCE)) {
- final String[] resources =
- StringSupport.trimOrNull(config.getAttributeNS(null, ATTR_SPRING_RESOURCE)).split(";");
- log.debug("{} Native configuration from {}", getLogPrefix(), resources);
- builder.addPropertyValue("resources", resources);
- } else {
- final String resourceRef =
- StringSupport.trimOrNull(config.getAttributeNS(null, ATTR_SPRING_RESOURCE_REF));
- log.debug("{} Native configuration from bean {}", getLogPrefix(), resourceRef);
- builder.addPropertyReference("resources", resourceRef);
- }
- if (config.hasAttributeNS(null, ATTR_FACTORY_POSTPROCESSORS_REF)) {
- final String factoryPostProcessorsRef =
- StringSupport.trimOrNull(config.getAttributeNS(null, ATTR_FACTORY_POSTPROCESSORS_REF));
- log.debug("{} Factory Bean Post Processors {}", getLogPrefix(), factoryPostProcessorsRef);
- builder.addPropertyReference("beanFactoryPostProcessors", factoryPostProcessorsRef);
- } else {
- log.debug("{} Adding default Factory Bean Post Processor: "
- + "shibboleth.PropertySourcesPlaceholderConfigurer", getLogPrefix());
- builder.addPropertyReference("beanFactoryPostProcessors",
- "shibboleth.PropertySourcesPlaceholderConfigurer");
- }
- if (config.hasAttributeNS(null, ATTR_POSTPROCESSORS_REF)) {
- final String postProcessorsRef =
- StringSupport.trimOrNull(config.getAttributeNS(null, ATTR_POSTPROCESSORS_REF));
- log.debug("{} Bean Post Processors {}", getLogPrefix(), postProcessorsRef);
- builder.addPropertyReference("beanPostProcessors", postProcessorsRef);
- }
- } else {
- doV2Parse(config, parserContext, builder);
- }
+ doV2Parse(config, parserContext, builder);
}
//CheckStyle: MethodLength|CyclomaticComplexity ON
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ScriptedDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ScriptedDataConnectorParser.java
index cd735e7d2..4aba73939 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ScriptedDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ScriptedDataConnectorParser.java
@@ -64,12 +64,7 @@ public class ScriptedDataConnectorParser extends AbstractDataConnectorParser {
/** {@inheritDoc} */
@Override protected void doParse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
@Nonnull final BeanDefinitionBuilder builder) {
- if (isNative(config)) {
- // V4 Deprecation
- DeprecationSupport.warnOnce(ObjectType.ATTRIBUTE, ATTR_SPRING_RESOURCE, null,null);
- }
super.doParse(config, parserContext, builder);
-
builder.addAutowiredProperty("scriptContextExtenders");
}
diff --git a/shib-attribute-resolver-spring/src/main/resources/schema/shibboleth-attribute-resolver.xsd b/shib-attribute-resolver-spring/src/main/resources/schema/shibboleth-attribute-resolver.xsd
index efcda8f00..0ee9372de 100644
--- a/shib-attribute-resolver-spring/src/main/resources/schema/shibboleth-attribute-resolver.xsd
+++ b/shib-attribute-resolver-spring/src/main/resources/schema/shibboleth-attribute-resolver.xsd
@@ -147,29 +147,6 @@
<documentation>Time to bypass connector after a failure before trying it again.</documentation>
</annotation>
</attribute>
- <attribute name="springResources" type="resolver:string">
- <annotation>
- <documentation>Locations of Spring resource configurations.</documentation>
- </annotation>
- </attribute>
- <attribute name="springResourcesRef" type="resolver:string">
- <annotation>
- <documentation>Bean Name of locations of Spring resource configurations.</documentation>
- </annotation>
- </attribute>
- <attribute name="factoryPostProcessorsRef" type="resolver:string">
- <annotation>
- <documentation>
- Bean Name of locations of bean factory post processors resource configurations.
- Defaults to shibboleth.PropertySourcesPlaceholderConfigurer.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="postProcessorsRef" type="resolver:string">
- <annotation>
- <documentation>Bean Name of a list of bean post processors.</documentation>
- </annotation>
- </attribute>
<attribute name="exportAllAttributes" type="resolver:string">
<annotation>
<documentation>Whether all attributes from this data connected are to be exported by the resolution process.</documentation>
diff --git a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StaticDataConnectorParserTest.java b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StaticDataConnectorParserTest.java
index ee294c1fb..2c67cbd39 100644
--- a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StaticDataConnectorParserTest.java
+++ b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StaticDataConnectorParserTest.java
@@ -57,22 +57,6 @@ public class StaticDataConnectorParserTest extends BaseAttributeDefinitionParser
assertTrue(values.contains(new StringAttributeValue("member")));
}
- @Test public void hybrid() {
- final StaticDataConnector connector = getDataConnector("resolver/staticAttributesHybrid.xml", StaticDataConnector.class);
- assertTrue(connector.isExportAllAttributes());
-
- assertEquals(connector.getAttributes().keySet().size(), 2);
- final IdPAttribute epe = connector.getAttributes().get("eduPersonEntitlement");
- List<IdPAttributeValue> values = epe.getValues();
- assertEquals(values.size(), 2);
- assertTrue(values.contains(new StringAttributeValue("urn:example.org:entitlement:entitlement1")));
- assertTrue(values.contains(new StringAttributeValue("urn:mace:dir:entitlement:common-lib-terms")));
-
- values = connector.getAttributes().get("staticEpA").getValues();
- assertEquals(values.size(), 1);
- assertTrue(values.contains(new StringAttributeValue("member")));
- }
-
@Test public void ref() {
final StaticDataConnector connector = getDataConnector("resolver/staticAttributesRef.xml", StaticDataConnector.class);
assertTrue(connector.isExportAllAttributes());
diff --git a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StoredIdDataConnectorParserTest.java b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StoredIdDataConnectorParserTest.java
index ae4e7b5d8..a74e8d9ea 100644
--- a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StoredIdDataConnectorParserTest.java
+++ b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StoredIdDataConnectorParserTest.java
@@ -33,7 +33,6 @@ import net.shibboleth.idp.attribute.impl.ComputedPairwiseIdStore;
import net.shibboleth.idp.attribute.impl.JDBCPairwiseIdStore;
import net.shibboleth.idp.attribute.resolver.ResolverAttributeDefinitionDependency;
import net.shibboleth.idp.attribute.resolver.dc.impl.PairwiseIdDataConnector;
-import net.shibboleth.idp.attribute.resolver.spring.dc.impl.StoredIdDataConnectorParser;
import net.shibboleth.idp.attribute.resolver.spring.dc.rdbms.impl.RDBMSDataConnectorParserTest;
import net.shibboleth.idp.attribute.resolver.spring.testing.BaseAttributeDefinitionParserTest;
import net.shibboleth.shared.component.ComponentInitializationException;
diff --git a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParserTest.java b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParserTest.java
index 9cfa500e7..e0de74607 100644
--- a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParserTest.java
+++ b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParserTest.java
@@ -482,20 +482,6 @@ public class LDAPDataConnectorParserTest {
assertEquals(saslConfig.getMechanism(), Mechanism.EXTERNAL);
}
- @Test public void springConfig() throws Exception {
- final LDAPDataConnector dataConnector =
- getLdapDataConnector(new String[] {"net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-spring.xml"});
- assertNotNull(dataConnector);
- doTest(dataConnector);
-
- dataConnector.initialize();
- final AttributeResolutionContext context =
- TestSources.createResolutionContext(TestSources.PRINCIPAL_ID, TestSources.IDP_ENTITY_ID,
- TestSources.SP_ENTITY_ID);
- final Map<String, IdPAttribute> attrs = dataConnector.resolve(context);
- assertNotNull(attrs);
- }
-
@Test public void refConfig() throws Exception {
final LDAPDataConnector dataConnector =
getLdapDataConnector(new String[] {"net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-ref.xml",
@@ -511,27 +497,6 @@ public class LDAPDataConnectorParserTest {
assertNotNull(attrs);
}
-
- @Test public void springPropsConfig() throws Exception,
- ResolutionException {
- final Resource props = new ClassPathResource("net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v3.properties");
- final LDAPDataConnector dataConnector =
- getLdapDataConnector(props, new String[] {"net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-spring-props.xml"});
- assertNotNull(dataConnector);
- doTest(dataConnector);
-
- dataConnector.initialize();
- final AttributeResolutionContext context =
- TestSources.createResolutionContext(TestSources.PRINCIPAL_ID, TestSources.IDP_ENTITY_ID,
- TestSources.SP_ENTITY_ID);
- final Map<String, IdPAttribute> attrs = dataConnector.resolve(context);
- assertNotNull(attrs);
- assertEquals(attrs.size(), 3);
- assertNotNull(attrs.get("uid"));
- assertNotNull(attrs.get("phonenumber"));
- assertNotNull(attrs.get("mail"));
- }
-
/**
* This test will fail when it is time to revert the fixes put in for
* https://issues.shibboleth.net/jira/browse/IDP-338.
diff --git a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParserTest.java b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParserTest.java
index 910c39b84..01c03bcf0 100644
--- a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParserTest.java
+++ b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParserTest.java
@@ -141,22 +141,6 @@ public class RDBMSDataConnectorParserTest {
doTest(dataConnector);
}
- @Test public void springConfig() throws Exception {
- final RDBMSDataConnector dataConnector =
- getRdbmsDataConnector("net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/rdbms-attribute-resolver-spring.xml");
- assertNotNull(dataConnector);
- doTest(dataConnector);
- }
-
- @Test public void springPropsConfig() throws Exception {
- final Resource props = new ClassPathResource("net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-v3.properties");
-
- final RDBMSDataConnector dataConnector =
- getRdbmsDataConnector(props, "net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/rdbms-attribute-resolver-spring-props.xml");
- assertNotNull(dataConnector);
- doTest(dataConnector);
- }
-
protected RDBMSDataConnector getRdbmsDataConnector(final String... beanDefinitions) throws IOException {
return getRdbmsDataConnector(null, beanDefinitions);
}
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-props-context.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-props-context.xml
deleted file mode 100644
index e11b6a604..000000000
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-props-context.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
- <bean id="connectionFactory" class="org.ldaptive.PooledConnectionFactory" init-method="initialize"
- p:blockWaitTime="%{connectionPool.blockWaitTime}"
- p:failFastInitialize="%{connectionPool.failFastInitialize}"
- p:name="resolver-pool"
- p:minPoolSize="%{connectionPool.minPoolSize}"
- p:maxPoolSize="%{connectionPool.maxPoolSize}"
- p:validatePeriodically="%{connectionPool.validatePeriodically}">
- <property name="connectionConfig">
- <bean class="org.ldaptive.ConnectionConfig" p:ldapUrl="%{connectionConfig.ldapURL}"
- p:useStartTLS="%{connectionConfig.useStartTLS}"
- p:connectTimeout="%{connectionConfig.connectTimeout}" p:responseTimeout="%{connectionConfig.responseTimeout}">
- <property name="connectionInitializers">
- <bean class="org.ldaptive.BindConnectionInitializer" p:bindDn="%{connectionConfig.bindDn}"
- p:bindCredential="%{connectionConfig.bindCredential}" />
- </property>
- <property name="sslConfig">
- <bean class="org.ldaptive.ssl.SslConfig">
- <property name="credentialConfig">
- <bean class="org.ldaptive.ssl.X509CredentialConfig"
- p:trustCertificates="file:src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/server.crt"
- p:authenticationCertificate="file:src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/client.crt"
- p:authenticationKey="file:src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/client.pkcs8" />
- </property>
- </bean>
- </property>
- </bean>
- </property>
- <property name="validator">
- <bean class="org.ldaptive.SearchConnectionValidator" p:validatePeriod="%{connectionPool.validatePeriod}">
- <property name="searchRequest">
- <bean class="org.ldaptive.SearchRequest">
- <constructor-arg value="%{connectionPool.validator.baseDn}" />
- <constructor-arg value="%{connectionPool.validator.filter}" />
- </bean>
- </property>
- </bean>
- </property>
- <property name="pruneStrategy">
- <bean class="org.ldaptive.pool.IdlePruneStrategy" p:prunePeriod="%{connectionPool.pruneStrategy.prunePeriod}"
- p:idleTime="%{connectionPool.pruneStrategy.idleTime}" />
- </property>
- </bean>
- <bean class="org.ldaptive.SearchOperation">
- <property name="request">
- <bean class="org.ldaptive.SearchRequest" p:baseDn="%{search.baseDn}" p:returnAttributes="%{search.returnAttributes}" p:timeLimit="%{search.timeLimit}" />
- </property>
- </bean>
- <bean id="cacheBuilder" class="com.google.common.cache.CacheBuilder" factory-method="from">
- <constructor-arg value="%{cache.cacheBuilderSpec}" />
- </bean>
- <bean id="cache" class="com.google.common.cache.Cache" factory-bean="cacheBuilder" factory-method="build" />
- <bean class="net.shibboleth.idp.attribute.resolver.dc.ldap.TemplatedExecutableSearchFilterBuilder"
- p:templateText="%{search.filter}" p:velocityEngine-ref="shibboleth.VelocityEngine"
- init-method="initialize" />
- <bean id="mappings" class="net.shibboleth.idp.attribute.resolver.dc.ldap.StringAttributeValueMappingStrategy"
- p:noResultAnError="%{noResultIsError}" p:multipleResultsAnError="%{multipleResultsIsError}">
- <property name="resultRenamingMap">
- <map>
- <entry key="homephone" value="phonenumber" />
- </map>
- </property>
- </bean>
- <bean id="validator" class="net.shibboleth.idp.attribute.resolver.dc.ldap.impl.ConnectionFactoryValidator"
- p:connectionFactory-ref="connectionFactory" p:throwValidateError="true" />
-</beans>
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-spring-props.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-spring-props.xml
deleted file mode 100644
index 9ac166c7a..000000000
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-spring-props.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<AttributeResolver
- xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
-
- <DataConnector
- id="myLDAP"
- xsi:type="LDAPDirectory"
- noRetryDelay="%{noRetryDelay}"
- springResources="classpath:net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-props-context.xml"/>
-
-</AttributeResolver>
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-spring.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-spring.xml
deleted file mode 100644
index 880ffe691..000000000
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-spring.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<AttributeResolver
- xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd">
-
- <DataConnector
- id="myLDAP"
- xsi:type="LDAPDirectory"
- noRetryDelay="PT5M"
- springResources="classpath:net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-context.xml"/>
-
-</AttributeResolver>
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-attribute-resolver-spring-props-context.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-attribute-resolver-spring-props-context.xml
deleted file mode 100644
index 26321627e..000000000
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-attribute-resolver-spring-props-context.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:p="http://www.springframework.org/schema/p" xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd"
- default-init-method="initialize">
- <bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close" p:driverClassName="org.hsqldb.jdbc.JDBCDriver"
- p:maxTotal="20" p:maxIdle="5" p:maxWaitMillis="5000" p:url="jdbc:hsqldb:mem:RDBMSDataConnectorStore" p:username="SA" p:password="" />
-
- <bean id="connectionReadOnly" class="java.lang.Boolean" factory-method="valueOf">
- <constructor-arg value="%{dataConnector.readOnlyConnection}" />
- </bean>
- <bean id="cacheBuilder" class="com.google.common.cache.CacheBuilder" factory-method="from">
- <constructor-arg value="%{cache.cacheBuilderSpec}" />
- </bean>
- <bean id="cache" class="com.google.common.cache.Cache" factory-bean="cacheBuilder" factory-method="build" />
- <bean class="net.shibboleth.idp.attribute.resolver.dc.rdbms.FormatExecutableStatementBuilder"
- p:query="SELECT * FROM people WHERE userid='%s'" />
- <bean id="mappings" class="net.shibboleth.idp.attribute.resolver.dc.rdbms.StringResultMappingStrategy"
- p:noResultAnError="true" p:multipleResultsAnError="true">
- <property name="resultRenamingMap">
- <map>
- <entry key="homephone" value="phonenumber" />
- </map>
- </property>
- </bean>
- <bean id="validator" class="net.shibboleth.idp.attribute.resolver.dc.rdbms.impl.DataSourceValidator" p:dataSource-ref="dataSource" p:throwValidateError="true" />
-</beans>
\ No newline at end of file
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/rdbms-attribute-resolver-spring-props.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/rdbms-attribute-resolver-spring-props.xml
deleted file mode 100644
index 1e5125392..000000000
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/rdbms-attribute-resolver-spring-props.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<AttributeResolver
- xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
-
- <DataConnector
- id="myDatabase"
- xsi:type="RelationalDatabase"
- noRetryDelay="%{noRetryDelay}"
- springResourcesRef="rdbmsResource"/>
-
-</AttributeResolver>
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/rdbms-attribute-resolver-spring.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/rdbms-attribute-resolver-spring.xml
deleted file mode 100644
index 1e04d6dac..000000000
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/rdbms-attribute-resolver-spring.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<AttributeResolver
- xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
-
- <DataConnector
- id="myDatabase"
- xsi:type="RelationalDatabase"
- noRetryDelay="PT5M"
- springResources="classpath:net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-attribute-resolver-spring-context.xml"/>
-
-</AttributeResolver>
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/staticAttributesHybrid.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/staticAttributesHybrid.xml
deleted file mode 100644
index 7cafd7b1b..000000000
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/staticAttributesHybrid.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DataConnector id="staticAttributes" xsi:type="Static"
- exportAllAttributes="true"
- xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"
- springResources="classpath:/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/staticAttributesHybridSpring.xml"/>
\ No newline at end of file
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/staticAttributesHybridSpring.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/staticAttributesHybridSpring.xml
deleted file mode 100644
index 90ae7a6d2..000000000
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/staticAttributesHybridSpring.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p" xmlns:c="http://www.springframework.org/schema/c"
- xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
- default-init-method="initialize">
-
-<util:list id="values">
- <bean class="net.shibboleth.idp.attribute.IdPAttribute" c:attributeId="staticEpA">
- <property name="values">
- <bean class="net.shibboleth.idp.attribute.StringAttributeValue" c:attributeValue="member" />
- </property>
- </bean>
- <bean class="net.shibboleth.idp.attribute.IdPAttribute" c:attributeId="eduPersonEntitlement">
- <property name="values">
- <list>
- <bean class="net.shibboleth.idp.attribute.StringAttributeValue" c:attributeValue="urn:example.org:entitlement:entitlement1" />
- <bean class="net.shibboleth.idp.attribute.StringAttributeValue" c:attributeValue="urn:mace:dir:entitlement:common-lib-terms" />
- </list>
- </property>
-
- </bean>
-</util:list>
-</beans>
\ No newline at end of file
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/externalBeans.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/externalBeans.xml
index ad4a9f933..7ea70c9b2 100644
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/externalBeans.xml
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/externalBeans.xml
@@ -49,9 +49,4 @@
<util:list id="emptyList"/>
- <util:list id="rdbmsResource">
- <bean class="org.springframework.core.io.ClassPathResource" destroy-method=""
- c:path="net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-attribute-resolver-spring-props-context.xml"/>
- </util:list>
-
</beans>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list