[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: Wed Apr 10 13:39:20 2013
New Revision: 4397

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4397&view=rev
Log:
IDP-203 Parsers (and tests) for CryptoTransientIdAttruibuteDefinition

Added:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/CryptoTransientIdAttributeDefinitionBeanDefinitionParser.java   (with props)
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/TestCryptoTransientIdAttributeDefinitionBeanDefinitionParser.java   (with props)
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/SealerKeyStore.jks   (with props)
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/cryptoNoTime.xml   (with props)
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/cryptoWithTime.xml   (with props)
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/sealer.xml   (with props)
Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/AttributeDefinitionNamespaceHandler.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseTestAttributeDefinitionBeanParser.java

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/AttributeDefinitionNamespaceHandler.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/AttributeDefinitionNamespaceHandler.java?rev=4397&r1=4396&r2=4397&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/AttributeDefinitionNamespaceHandler.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/AttributeDefinitionNamespaceHandler.java Wed Apr 10 13:39:20 2013
@@ -20,7 +20,9 @@
 import net.shibboleth.idp.spring.BaseSpringNamespaceHandler;
 
 // TODO incomplete
-/** Namespace handler for {@link BaseAttributeDefinition}s. */
+/**
+ * Namespace handler for {@link net.shibboleth.idp.attribute.resolver.BaseAttributeDefinition.BaseAttributeDefinition}s.
+ */
 public class AttributeDefinitionNamespaceHandler extends BaseSpringNamespaceHandler {
 
     /** Namespace for this handler. */
@@ -32,5 +34,7 @@
                 new SimpleAttributeDefinitionBeanDefinitionParser());
         registerBeanDefinitionParser(ScriptedAttributeDefinitionBeanDefinitionParser.TYPE_NAME,
                 new ScriptedAttributeDefinitionBeanDefinitionParser());
+        registerBeanDefinitionParser(CryptoTransientIdAttributeDefinitionBeanDefinitionParser.TYPE_NAME,
+                new CryptoTransientIdAttributeDefinitionBeanDefinitionParser());
     }
 }

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseTestAttributeDefinitionBeanParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseTestAttributeDefinitionBeanParser.java?rev=4397&r1=4396&r2=4397&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseTestAttributeDefinitionBeanParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseTestAttributeDefinitionBeanParser.java Wed Apr 10 13:39:20 2013
@@ -33,10 +33,7 @@
  */
 public abstract class BaseTestAttributeDefinitionBeanParser {
 
-    protected <Type extends BaseAttributeDefinition> Type getAttributeDefn(String fileName, Class<Type> claz) {
-
-        GenericApplicationContext context = new GenericApplicationContext();
-        context.setDisplayName("ApplicationContext: " + TestDependency.class);
+    protected <Type extends BaseAttributeDefinition> Type getAttributeDefn(String fileName, Class<Type> claz, GenericApplicationContext context) {
 
         SchemaTypeAwareXMLBeanDefinitionReader beanDefinitionReader =
                 new SchemaTypeAwareXMLBeanDefinitionReader(context);
@@ -48,4 +45,13 @@
 
         return (Type) beans.iterator().next();
     }
+    
+    protected <Type extends BaseAttributeDefinition> Type getAttributeDefn(String fileName, Class<Type> claz) {
+
+        GenericApplicationContext context = new GenericApplicationContext();
+        context.setDisplayName("ApplicationContext: " + TestDependency.class);
+
+        return getAttributeDefn(fileName, claz, context);
+    }
+
 }