[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/r...

[noreply at shibboleth.net]

Author: rdw
Date: Thu May  8 04:46:54 2014
New Revision: 5887

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5887&view=rev
Log:
IDP-377 Add parser support for an injected bean to control encoding
IDP-385 Convert some types to atring to allow preoprty replacement

Added:
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/predicates.xml   (with props)
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringConditional.xml   (with props)
Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseAttributeDefinitionParserTest.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringAttributeEncoderParserTest.java
    trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-encoder.xsd
    trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java?rev=5887&r1=5886&r2=5887&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java Thu May  8 04:46:54 2014
@@ -62,6 +62,10 @@
             throw new BeanCreationException("Attribute encoder must contain a name property");
         }
         
+        if (config.hasAttributeNS(null, "activationConditionRef")) {
+            builder.addPropertyReference("activationCondition", config.getAttributeNS(null, "activationConditionRef"));
+        }
+        
         builder.setInitMethodName("initialize");
         builder.setDestroyMethodName("destroy");
         builder.addPropertyValue("name", attributeName);

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseAttributeDefinitionParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseAttributeDefinitionParserTest.java?rev=5887&r1=5886&r2=5887&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseAttributeDefinitionParserTest.java (original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseAttributeDefinitionParserTest.java Thu May  8 04:46:54 2014
@@ -41,7 +41,7 @@
  * Test for {@link SimpleAttributeDefinitionParser} and by extension {@link BaseAttributeDefinitionParser}.
  */
 public abstract class BaseAttributeDefinitionParserTest extends OpenSAMLInitBaseTestCase {
-    
+
     public static final String BEAN_FILE_PATH = "net/shibboleth/idp/attribute/resolver/spring/";
 
     public static final String ATTRIBUTE_FILE_PATH = BEAN_FILE_PATH + "ad/";
@@ -52,6 +52,16 @@
 
     public static final String PRINCIPALCONNECTOR_FILE_PATH = BEAN_FILE_PATH + "pc/";
 
+    protected void loadFile(String fileName, GenericApplicationContext context, boolean supressValid) {
+        SchemaTypeAwareXMLBeanDefinitionReader beanDefinitionReader =
+                new SchemaTypeAwareXMLBeanDefinitionReader(context);
+
+        if (supressValid) {
+            beanDefinitionReader.setValidating(false);
+        }
+        beanDefinitionReader.loadBeanDefinitions(fileName);
+    }
+
     protected <Type> Type getBean(String fileName, Class<Type> claz, GenericApplicationContext context,
             boolean supressValid) {
 
@@ -59,18 +69,12 @@
         service.setConverters(Sets.newHashSet(new DurationToLongConverter(), new StringToIPRangeConverter()));
         service.afterPropertiesSet();
 
-        context.getBeanFactory().setConversionService(service.getObject());    
+        context.getBeanFactory().setConversionService(service.getObject());
 
-        SchemaTypeAwareXMLBeanDefinitionReader beanDefinitionReader =
-                new SchemaTypeAwareXMLBeanDefinitionReader(context);
+        loadFile(fileName, context, supressValid);
 
-        if (supressValid) {
-            beanDefinitionReader.setValidating(false);
-        }
-        beanDefinitionReader.loadBeanDefinitions(fileName);
-        
         context.refresh();
-        
+
         Collection<Type> beans = context.getBeansOfType(claz).values();

[... 685 lines stripped ...]