[java-idp-testbed COMMIT] in /trunk: pom.xml src/main/config/conf/attribute-resolver-config.xml src/main/config/conf/...

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Nov 13 19:29:56 2013
New Revision: 47

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=47&view=rev
Log:
Initial ability to resolve attributes.

Added:
    trunk/src/main/config/conf/attribute-resolver-config.xml   (with props)
    trunk/src/main/config/conf/attribute-resolver.xml   (with props)
    trunk/src/main/java/idp/AddBasicMessageMetadataContext.java   (with props)
    trunk/src/main/java/idp/AddProfileConfiguration.java   (with props)
    trunk/src/main/java/idp/AlwaysTrueActivatedRelyingPartyPredicate.java   (with props)
    trunk/src/main/java/idp/SpringResource.java   (with props)
Modified:
    trunk/pom.xml
    trunk/src/main/config/conf/global-user.xml
    trunk/src/main/config/system/flows/saml2/sso-abstract-beans.xml
    trunk/src/main/config/system/flows/saml2/sso-abstract-flow.xml

Modified: trunk/pom.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/pom.xml?rev=47&r1=46&r2=47&view=diff
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Wed Nov 13 19:29:56 2013
@@ -41,6 +41,12 @@
         <dependency>
             <groupId>${idp.groupId}</groupId>
             <artifactId>idp-profile-impl</artifactId>
+            <version>${idp.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>${idp.groupId}</groupId>
+            <artifactId>idp-attribute-resolver-spring</artifactId>
             <version>${idp.version}</version>
         </dependency>
 

Modified: trunk/src/main/config/conf/global-user.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/config/conf/global-user.xml?rev=47&r1=46&r2=47&view=diff
==============================================================================
--- trunk/src/main/config/conf/global-user.xml (original)
+++ trunk/src/main/config/conf/global-user.xml Wed Nov 13 19:29:56 2013
@@ -16,5 +16,7 @@
 
     <import resource="authn-comparison.xml" />
     <import resource="authn-flow-descriptors.xml" />
-        
+    
+    <import resource="attribute-resolver-config.xml" />
+     
 </beans>

Modified: trunk/src/main/config/system/flows/saml2/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/config/system/flows/saml2/sso-abstract-beans.xml?rev=47&r1=46&r2=47&view=diff
==============================================================================
--- trunk/src/main/config/system/flows/saml2/sso-abstract-beans.xml (original)
+++ trunk/src/main/config/system/flows/saml2/sso-abstract-beans.xml Wed Nov 13 19:29:56 2013
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:c="http://www.springframework.org/schema/c"
        xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:p="http://www.springframework.org/schema/p"
        xmlns:util="http://www.springframework.org/schema/util"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="
@@ -149,5 +151,43 @@
         <property name="httpServletResponse" ref="shibboleth.HttpServletResponse" />
         <property name="velocityEngine" ref="shibboleth.VelocityEngine" />
     </bean>
+    
+    <bean id="AddBasicMessageMetadataContext" class="idp.AddBasicMessageMetadataContext" />
+    
+    <bean id="AddProfileConfiguration" class="idp.AddProfileConfiguration" />
+            
+    <bean id="CheckMandatoryIssuer" class="net.shibboleth.idp.profile.impl.CheckMandatoryIssuer" />
+    
+    <bean id="InitializeRelyingPartyContextBasedOnInboundMessageIssuer" class="net.shibboleth.idp.saml.impl.profile.InitializeRelyingPartyContextBasedOnInboundMessageIssuer" />
+    
+    <bean id="ResolveAttributes" class="net.shibboleth.idp.profile.impl.ResolveAttributes" >
+       <constructor-arg ref="AttributeResolver"/>
+    </bean>
+
+    <!-- TODO replace always true with something else -->
+    <bean id="ActivatedRelyingPartyConfiguration" class="net.shibboleth.idp.relyingparty.impl.ActivatedRelyingPartyConfiguration">
+        <constructor-arg value="ActivatedRelyingPartyConfiguration" />
+        <constructor-arg value="ALWAYS_TRUE" />
+        <constructor-arg>
+            <null />
+        </constructor-arg>
+        <constructor-arg>
+            <bean id="ActivatedRelyingPartyPredicate" class="idp.AlwaysTrueActivatedRelyingPartyPredicate" />
+        </constructor-arg>
+    </bean>
+
+    <bean id="ActivatedRelyingPartyConfigurationResolver" p:id="ActivatedRelyingPartyConfigurationResolver" class="net.shibboleth.idp.relyingparty.impl.ActivatedRelyingPartyConfigurationResolver">
+        <property name="relyingPartyConfigurations">
+            <util:list>
+                <ref bean="ActivatedRelyingPartyConfiguration" />
+            </util:list>
+        </property>
+    </bean>
+
+    <bean id="SelectRelyingPartyConfiguration" class="net.shibboleth.idp.profile.impl.SelectRelyingPartyConfiguration">
+        <constructor-arg ref="ActivatedRelyingPartyConfigurationResolver" />
+    </bean>
+

[... 77 lines stripped ...]