[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/logback.xml idp-conf/src/main/resources/s...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Dec 26 22:57:12 2013
New Revision: 5092

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5092&view=rev
Log:
Move InitAuthnContext action into idp-saml-impl, support both SAML versions.

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/InitializeAuthenticationContext.java   (with props)
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/InitializeAuthenticationContextTest.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/logback.xml
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-flow.xml
    trunk/idp-profile-impl/pom.xml
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/CreateAuthenticationContext.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/CreateAuthenticationContextTest.java

Modified: trunk/idp-conf/src/main/resources/conf/logback.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/logback.xml?rev=5092&r1=5091&r2=5092&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/logback.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/logback.xml Thu Dec 26 22:57:12 2013
@@ -12,6 +12,8 @@
   <logger name="net.shibboleth.idp.authn" level="DEBUG"/>
   
   <logger name="net.shibboleth.idp.session" level="DEBUG"/>
+
+  <logger name="net.shibboleth.idp.saml" level="DEBUG"/>
   
   <logger name="org.springframework.web" level="WARN"/>
   

Modified: trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml?rev=5092&r1=5091&r2=5092&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml Thu Dec 26 22:57:12 2013
@@ -82,7 +82,7 @@
         <constructor-arg value="INBOUND" />
     </bean>
     
-    <bean id="CreateAuthenticationContext" class="net.shibboleth.idp.profile.impl.CreateAuthenticationContext" />
+    <bean id="InitializeAuthenticationContext" class="net.shibboleth.idp.saml.impl.profile.InitializeAuthenticationContext" scope="prototype" />
     
     <bean id="BuildResponse" class="idp.BuildMockSaml2Response" />
     

Modified: trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-flow.xml?rev=5092&r1=5091&r2=5092&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-flow.xml Thu Dec 26 22:57:12 2013
@@ -47,11 +47,11 @@
     
     <action-state id="SelectProfileConfiguration">
         <evaluate expression="SelectProfileConfiguration" />
-        <transition on="proceed" to="CreateAuthenticationContext"/>
+        <transition on="proceed" to="InitializeAuthenticationContext"/>
     </action-state>
         
-    <action-state id="CreateAuthenticationContext">
-        <evaluate expression="CreateAuthenticationContext" />
+    <action-state id="InitializeAuthenticationContext">
+        <evaluate expression="InitializeAuthenticationContext" />
         <transition on="proceed" to="DoAuthenticationSubflow" />
     </action-state>
     

Modified: trunk/idp-profile-impl/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/pom.xml?rev=5092&r1=5091&r2=5092&view=diff
==============================================================================
--- trunk/idp-profile-impl/pom.xml (original)
+++ trunk/idp-profile-impl/pom.xml Thu Dec 26 22:57:12 2013
@@ -42,11 +42,6 @@
             <artifactId>idp-attribute-filter-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>idp-authn-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
 
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
@@ -79,12 +74,6 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-saml-impl</artifactId>
-            <version>${opensaml.version}</version>
-            <scope>test</scope>
-        </dependency>
 
         <dependency>
             <groupId>${project.groupId}</groupId>