[java-identity-provider] branch feature/IDP-1434 updated: Switch encoder parsers to reuse existing system beans.
Scott Cantor
cantor.2 at osu.edu
Mon May 6 15:46:36 EDT 2019
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch feature/IDP-1434
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=d771b4e5d53deb0d128ac18ebbe24851de0b784d
The following commit(s) were added to refs/heads/feature/IDP-1434 by this push:
new d771b4e Switch encoder parsers to reuse existing system beans.
d771b4e is described below
commit d771b4e5d53deb0d128ac18ebbe24851de0b784d
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon May 6 15:46:34 2019 -0400
Switch encoder parsers to reuse existing system beans.
---
.../spring/enc/BaseAttributeEncoderParser.java | 11 +++--------
.../enc/impl/SAML1Base64AttributeEncoderParser.java | 8 ++++----
.../SAML1ScopedStringAttributeEncoderParser.java | 9 ++++-----
.../enc/impl/SAML1StringAttributeEncoderParser.java | 8 ++++----
.../impl/SAML1XMLObjectAttributeEncoderParser.java | 8 ++++----
.../enc/impl/SAML2Base64AttributeEncoderParser.java | 8 ++++----
.../SAML2ScopedStringAttributeEncoderParser.java | 9 ++++-----
.../enc/impl/SAML2StringAttributeEncoderParser.java | 8 ++++----
.../impl/SAML2XMLObjectAttributeEncoderParser.java | 8 ++++----
.../spring/AttributeMappingNodeProcessorTest.java | 4 +++-
.../idp/attribute/resolver/filter/service.xml | 3 +--
.../idp/attribute/resolver/spring/customBean.xml | 20 ++++++++++++++++++++
.../idp/attribute/resolver/spring/enc/predicates.xml | 10 ----------
.../idp/attribute/resolver/spring/mapperTest.xml | 3 +++
14 files changed, 62 insertions(+), 55 deletions(-)
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java
index 39095e8..08030e5 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java
@@ -32,7 +32,7 @@ import net.shibboleth.utilities.java.support.xml.ElementSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.BeanReference;
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.ManagedMap;
@@ -102,12 +102,7 @@ public abstract class BaseAttributeEncoderParser extends AbstractSingleBeanDefin
}
}
- final BeanDefinition transcoder = buildTranscoder();
-
- transcoder.setInitMethodName("initialize");
- transcoder.setDestroyMethodName("destroy");
-
- rule.put(AttributeTranscoderRegistry.PROP_TRANSCODER, transcoder);
+ rule.put(AttributeTranscoderRegistry.PROP_TRANSCODER, buildTranscoder());
doParse(config, context, rule);
}
@@ -128,6 +123,6 @@ public abstract class BaseAttributeEncoderParser extends AbstractSingleBeanDefin
*
* @return bean definition for an AttributeTranscoder
*/
- @Nonnull protected abstract BeanDefinition buildTranscoder();
+ @Nonnull protected abstract BeanReference buildTranscoder();
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1Base64AttributeEncoderParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1Base64AttributeEncoderParser.java
index d1a3a30..6cfe0b1 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1Base64AttributeEncoderParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1Base64AttributeEncoderParser.java
@@ -20,8 +20,8 @@ package net.shibboleth.idp.attribute.resolver.spring.enc.impl;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.config.BeanReference;
+import org.springframework.beans.factory.config.RuntimeBeanReference;
import net.shibboleth.idp.attribute.resolver.spring.enc.BaseSAML1AttributeEncoderParser;
import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
@@ -38,8 +38,8 @@ public class SAML1Base64AttributeEncoderParser extends BaseSAML1AttributeEncoder
/** {@inheritDoc} */
@Override
- protected BeanDefinition buildTranscoder() {
- return BeanDefinitionBuilder.genericBeanDefinition(SAML1ByteAttributeTranscoder.class).getBeanDefinition();
+ protected BeanReference buildTranscoder() {
+ return new RuntimeBeanReference("SAML1ByteTranscoder");
}
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1ScopedStringAttributeEncoderParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1ScopedStringAttributeEncoderParser.java
index 1c9c662..5446ddf 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1ScopedStringAttributeEncoderParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1ScopedStringAttributeEncoderParser.java
@@ -22,8 +22,8 @@ import java.util.Map;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.config.BeanReference;
+import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
@@ -64,9 +64,8 @@ public class SAML1ScopedStringAttributeEncoderParser extends BaseSAML1AttributeE
/** {@inheritDoc} */
@Override
- protected BeanDefinition buildTranscoder() {
- return BeanDefinitionBuilder.genericBeanDefinition(
- SAML1ScopedStringAttributeTranscoder.class).getBeanDefinition();
+ protected BeanReference buildTranscoder() {
+ return new RuntimeBeanReference("SAML1ScopedStringTranscoder");
}
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1StringAttributeEncoderParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1StringAttributeEncoderParser.java
index 153e479..e71f747 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1StringAttributeEncoderParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1StringAttributeEncoderParser.java
@@ -20,8 +20,8 @@ package net.shibboleth.idp.attribute.resolver.spring.enc.impl;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.config.BeanReference;
+import org.springframework.beans.factory.config.RuntimeBeanReference;
import net.shibboleth.idp.attribute.resolver.spring.enc.BaseSAML1AttributeEncoderParser;
import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
@@ -38,8 +38,8 @@ public class SAML1StringAttributeEncoderParser extends BaseSAML1AttributeEncoder
/** {@inheritDoc} */
@Override
- protected BeanDefinition buildTranscoder() {
- return BeanDefinitionBuilder.genericBeanDefinition(SAML1StringAttributeTranscoder.class).getBeanDefinition();
+ protected BeanReference buildTranscoder() {
+ return new RuntimeBeanReference("SAML1StringTranscoder");
}
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1XMLObjectAttributeEncoderParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1XMLObjectAttributeEncoderParser.java
index c76d5b7..97a0309 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1XMLObjectAttributeEncoderParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1XMLObjectAttributeEncoderParser.java
@@ -20,8 +20,8 @@ package net.shibboleth.idp.attribute.resolver.spring.enc.impl;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.config.BeanReference;
+import org.springframework.beans.factory.config.RuntimeBeanReference;
import net.shibboleth.idp.attribute.resolver.spring.enc.BaseSAML1AttributeEncoderParser;
import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
@@ -36,8 +36,8 @@ public class SAML1XMLObjectAttributeEncoderParser extends BaseSAML1AttributeEnco
/** {@inheritDoc} */
@Override
- protected BeanDefinition buildTranscoder() {
- return BeanDefinitionBuilder.genericBeanDefinition(SAML1XMLObjectAttributeTranscoder.class).getBeanDefinition();
+ protected BeanReference buildTranscoder() {
+ return new RuntimeBeanReference("SAML1XMLObjectTranscoder");
}
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2Base64AttributeEncoderParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2Base64AttributeEncoderParser.java
index c2c5180..8b78057 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2Base64AttributeEncoderParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2Base64AttributeEncoderParser.java
@@ -20,8 +20,8 @@ package net.shibboleth.idp.attribute.resolver.spring.enc.impl;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.config.BeanReference;
+import org.springframework.beans.factory.config.RuntimeBeanReference;
import net.shibboleth.idp.attribute.resolver.spring.enc.BaseSAML2AttributeEncoderParser;
import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
@@ -38,8 +38,8 @@ public class SAML2Base64AttributeEncoderParser extends BaseSAML2AttributeEncoder
/** {@inheritDoc} */
@Override
- protected BeanDefinition buildTranscoder() {
- return BeanDefinitionBuilder.genericBeanDefinition(SAML2ByteAttributeTranscoder.class).getBeanDefinition();
+ protected BeanReference buildTranscoder() {
+ return new RuntimeBeanReference("SAML2ByteTranscoder");
}
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2ScopedStringAttributeEncoderParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2ScopedStringAttributeEncoderParser.java
index 8f68342..3c0643a 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2ScopedStringAttributeEncoderParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2ScopedStringAttributeEncoderParser.java
@@ -22,8 +22,8 @@ import java.util.Map;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.config.BeanReference;
+import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
@@ -64,9 +64,8 @@ public class SAML2ScopedStringAttributeEncoderParser extends BaseSAML2AttributeE
/** {@inheritDoc} */
@Override
- protected BeanDefinition buildTranscoder() {
- return BeanDefinitionBuilder.genericBeanDefinition(
- SAML2ScopedStringAttributeTranscoder.class).getBeanDefinition();
+ protected BeanReference buildTranscoder() {
+ return new RuntimeBeanReference("SAML2ScopedStringTranscoder");
}
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2StringAttributeEncoderParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2StringAttributeEncoderParser.java
index be7a02f..0ae5203 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2StringAttributeEncoderParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2StringAttributeEncoderParser.java
@@ -20,8 +20,8 @@ package net.shibboleth.idp.attribute.resolver.spring.enc.impl;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.config.BeanReference;
+import org.springframework.beans.factory.config.RuntimeBeanReference;
import net.shibboleth.idp.attribute.resolver.spring.enc.BaseSAML2AttributeEncoderParser;
import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
@@ -38,8 +38,8 @@ public class SAML2StringAttributeEncoderParser extends BaseSAML2AttributeEncoder
/** {@inheritDoc} */
@Override
- protected BeanDefinition buildTranscoder() {
- return BeanDefinitionBuilder.genericBeanDefinition(SAML2StringAttributeTranscoder.class).getBeanDefinition();
+ protected BeanReference buildTranscoder() {
+ return new RuntimeBeanReference("SAML2StringTranscoder");
}
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2XMLObjectAttributeEncoderParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2XMLObjectAttributeEncoderParser.java
index 6fcbcba..2cf1a92 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2XMLObjectAttributeEncoderParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2XMLObjectAttributeEncoderParser.java
@@ -20,8 +20,8 @@ package net.shibboleth.idp.attribute.resolver.spring.enc.impl;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.config.BeanReference;
+import org.springframework.beans.factory.config.RuntimeBeanReference;
import net.shibboleth.idp.attribute.resolver.spring.enc.BaseSAML2AttributeEncoderParser;
import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
@@ -36,8 +36,8 @@ public class SAML2XMLObjectAttributeEncoderParser extends BaseSAML2AttributeEnco
/** {@inheritDoc} */
@Override
- protected BeanDefinition buildTranscoder() {
- return BeanDefinitionBuilder.genericBeanDefinition(SAML2XMLObjectAttributeTranscoder.class).getBeanDefinition();
+ protected BeanReference buildTranscoder() {
+ return new RuntimeBeanReference("SAML2XMLObjectTranscoder");
}
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMappingNodeProcessorTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMappingNodeProcessorTest.java
index 70c654b..02df1e3 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMappingNodeProcessorTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMappingNodeProcessorTest.java
@@ -97,7 +97,9 @@ public class AttributeMappingNodeProcessorTest extends XMLObjectBaseTestCase {
SchemaTypeAwareXMLBeanDefinitionReader beanDefinitionReader =
new SchemaTypeAwareXMLBeanDefinitionReader(context);
- beanDefinitionReader.loadBeanDefinitions("/net/shibboleth/idp/attribute/resolver/filter/service.xml");
+ beanDefinitionReader.loadBeanDefinitions(
+ "/net/shibboleth/idp/attribute/resolver/spring/customBean.xml",
+ "/net/shibboleth/idp/attribute/resolver/filter/service.xml");
context.refresh();
return context.getBean(ReloadableService.class);
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/service.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/service.xml
index 2dfc86e..957ac48 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/service.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/service.xml
@@ -19,8 +19,7 @@
</constructor-arg>
<property name="serviceConfigurations">
<util:list>
- <value>/net/shibboleth/idp/attribute/resolver/filter/resolver.xml
- </value>
+ <value>/net/shibboleth/idp/attribute/resolver/filter/resolver.xml</value>
</util:list>
</property>
</bean>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/customBean.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/customBean.xml
index 31ef1f6..19a1bb3 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/customBean.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/customBean.xml
@@ -25,6 +25,26 @@
class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
p:placeholderPrefix="%{" p:placeholderSuffix="}" />
+ <!-- Necessary for encoder parsing to function, normally part of registry wiring. -->
+
+ <bean id="SAML2StringTranscoder"
+ class="net.shibboleth.idp.saml.attribute.transcoding.impl.SAML2StringAttributeTranscoder" />
+ <bean id="SAML2ScopedStringTranscoder"
+ class="net.shibboleth.idp.saml.attribute.transcoding.impl.SAML2ScopedStringAttributeTranscoder" />
+ <bean id="SAML2ByteTranscoder"
+ class="net.shibboleth.idp.saml.attribute.transcoding.impl.SAML2ByteAttributeTranscoder" />
+ <bean id="SAML2XMLObjectTranscoder"
+ class="net.shibboleth.idp.saml.attribute.transcoding.impl.SAML2XMLObjectAttributeTranscoder" />
+
+ <bean id="SAML1StringTranscoder"
+ class="net.shibboleth.idp.saml.attribute.transcoding.impl.SAML1StringAttributeTranscoder" />
+ <bean id="SAML1ScopedStringTranscoder"
+ class="net.shibboleth.idp.saml.attribute.transcoding.impl.SAML1ScopedStringAttributeTranscoder" />
+ <bean id="SAML1ByteTranscoder"
+ class="net.shibboleth.idp.saml.attribute.transcoding.impl.SAML1ByteAttributeTranscoder" />
+ <bean id="SAML1XMLObjectTranscoder"
+ class="net.shibboleth.idp.saml.attribute.transcoding.impl.SAML1XMLObjectAttributeTranscoder" />
+
</beans>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/predicates.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/predicates.xml
deleted file mode 100644
index 8b4b613..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/predicates.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- 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:xsi="http://www.w3.org/2001/XMLSchema-instance"
- 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.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
-
- <bean id="predicate" class="com.google.common.base.Predicates" factory-method="alwaysFalse"/>
-</beans>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest.xml
index a936ac0..b86d5a7 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest.xml
@@ -8,6 +8,9 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
default-init-method="initialize"
default-destroy-method="destroy">
+
+ <import resource="customBean.xml" />
+
<bean id="shibboleth.VelocityEngine" class="net.shibboleth.ext.spring.velocity.VelocityEngineFactoryBean">
<property name="velocityProperties">
<props>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list